From 3a492beb68c2dcd3bfbe67e2e912917eb89dd839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moreno=20i=20Caireta=2C=20I=C3=B1igo?=
<inigo.moreno@tecnalia.com>
Date: Tue, 31 Aug 2021 14:48:33 +0200
Subject: [PATCH] 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