From c6f626aaaa9981051138097aee008e1321b0038c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Moreno?= <inigo.moreno@tecnalia.com>
Date: Mon, 6 Sep 2021 09:42:41 +0200
Subject: [PATCH] Update rules
---
...ab-industrial-ci-kinetic-no-rosinstall.yml | 47 ++++++++++++++-----
1 file changed, 36 insertions(+), 11 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 5946ecc..b3be1cc 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -3,6 +3,7 @@ image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
variables:
TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch
+ DEFAULT_DISTRO: "kinetic"
services:
- name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
@@ -13,7 +14,30 @@ stages:
workflow:
rules:
+ - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^kinetic-.*/
+ variables:
+ DEFAULT_DISTRO: "kinetic"
+ - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^melodic-.*/
+ variables:
+ DEFAULT_DISTRO: "melodic"
+ - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^noetic-.*/
+ variables:
+ DEFAULT_DISTRO: "noetic"
+ - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_NAME =~ /^kinetic-.*/
+ variables:
+ DEFAULT_DISTRO: "kinetic"
+ DEPLOY: "true"
+ - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_NAME =~ /^melodic-.*/
+ variables:
+ DEFAULT_DISTRO: "melodic"
+ DEPLOY: "true"
+ - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_NAME =~ /^noetic-.*/
+ variables:
+ DEFAULT_DISTRO: "noetic"
+ DEPLOY: "true"
- if: $CI_COMMIT_TAG
+ variables:
+ DEPLOY: "true"
- if: $CI_COMMIT_BRANCH
before_script:
@@ -42,13 +66,10 @@ industrial_ci_kinetic:
ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules:
- - if: $CI_COMMIT_TAG
- when: never
- - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
+ - if: $DEPLOY
when: never
- - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/
- when: never
- - when: always
+ - if: $DEFAULT_DISTRO == "kinetic"
+ - if: $BUILD_KINETIC
industrial_ci_melodic:
extends: .industrial_ci
@@ -56,9 +77,11 @@ industrial_ci_melodic:
ROS_DISTRO: melodic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules:
- - if: $CI_COMMIT_TAG
+ rules:
+ - if: $DEPLOY
when: never
- - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
+ - if: $DEFAULT_DISTRO == "melodic"
+ - if: $BUILD_MELODIC
industrial_ci_noetic:
extends: .industrial_ci
@@ -66,9 +89,11 @@ industrial_ci_noetic:
ROS_DISTRO: noetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules:
- - if: $CI_COMMIT_TAG
+ rules:
+ - if: $DEPLOY
when: never
- - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/
+ - if: $DEFAULT_DISTRO == "noetic"
+ - if: $BUILD_NOETIC
industrial_ci_kinetic_deploy:
extends: .industrial_ci
@@ -92,6 +117,6 @@ industrial_ci_kinetic_deploy:
- docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev
- cd ..
rules:
- - if: $CI_COMMIT_TAG
+ - if: $DEPLOY
include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/gitlab-ci/post-check.yml'
\ No newline at end of file
--
GitLab