From 3a492beb68c2dcd3bfbe67e2e912917eb89dd839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moreno=20i=20Caireta=2C=20I=C3=B1igo?= Date: Tue, 31 Aug 2021 14:48:33 +0200 Subject: [PATCH 1/3] Updated gitlab ci templates --- .gitlab-industrial-ci-kinetic-no-rosinstall.yml | 14 ++++++++++++++ .gitlab-industrial-ci-kinetic-with-rosinstall.yml | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index 14ba3a9..52f541f 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -47,6 +47,8 @@ industrial_ci_kinetic: when: never - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ when: never + - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ + when: never - when: always industrial_ci_melodic: @@ -57,8 +59,20 @@ industrial_ci_melodic: rules: - if: $CI_COMMIT_TAG when: never + - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ + when: never - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ +industrial_ci_noetic: + extends: .industrial_ci + variables: + ROS_DISTRO: noetic + DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" + rules: + - if: $CI_COMMIT_TAG + when: never + - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ + industrial_ci_kinetic_deploy: extends: .industrial_ci variables: diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml index 490770c..80afb7a 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -49,6 +49,8 @@ industrial_ci_kinetic: when: never - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ when: never + - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ + when: never - when: always industrial_ci_melodic: @@ -59,8 +61,20 @@ industrial_ci_melodic: rules: - if: $CI_COMMIT_TAG when: never + - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ + when: never - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ +industrial_ci_noetic: + extends: .industrial_ci + variables: + ROS_DISTRO: noetic + DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" + rules: + - if: $CI_COMMIT_TAG + when: never + - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ + industrial_ci_kinetic_deploy: extends: .industrial_ci variables: -- GitLab From e9d0e07447e68e2725209964bad423a9f3d4901f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Moreno?= Date: Thu, 2 Sep 2021 12:06:42 +0200 Subject: [PATCH 2/3] Fix missing supression for melodic branches --- .gitlab-industrial-ci-kinetic-no-rosinstall.yml | 2 ++ .gitlab-industrial-ci-kinetic-with-rosinstall.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index 43aeb72..aa3c07c 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -71,6 +71,8 @@ industrial_ci_noetic: rules: - if: $CI_COMMIT_TAG when: never + - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ + when: never - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ industrial_ci_kinetic_deploy: diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml index a34d900..6c41ea7 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -73,6 +73,8 @@ industrial_ci_noetic: rules: - if: $CI_COMMIT_TAG when: never + - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ + when: never - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ industrial_ci_kinetic_deploy: -- GitLab From 92da81d92b6e3357baa5e9d2663e26779d5e39c5 Mon Sep 17 00:00:00 2001 From: Jon Azpiazu Date: Fri, 3 Sep 2021 09:29:26 +0200 Subject: [PATCH 3/3] Remove uneeded exceptions --- .gitlab-industrial-ci-kinetic-no-rosinstall.yml | 4 ---- .gitlab-industrial-ci-kinetic-with-rosinstall.yml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index aa3c07c..d5cc20d 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -59,8 +59,6 @@ industrial_ci_melodic: rules: - if: $CI_COMMIT_TAG when: never - - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ - when: never - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ industrial_ci_noetic: @@ -71,8 +69,6 @@ industrial_ci_noetic: rules: - if: $CI_COMMIT_TAG when: never - - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ - when: never - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ industrial_ci_kinetic_deploy: diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml index 6c41ea7..643b46b 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -61,8 +61,6 @@ industrial_ci_melodic: rules: - if: $CI_COMMIT_TAG when: never - - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ - when: never - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ industrial_ci_noetic: @@ -73,8 +71,6 @@ industrial_ci_noetic: rules: - if: $CI_COMMIT_TAG when: never - - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ - when: never - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ industrial_ci_kinetic_deploy: -- GitLab