From 584393c4534600aeaca87fe55e38c61fb27e7f91 Mon Sep 17 00:00:00 2001
From: Jon Azpiazu <jon.azpiazu@tecnalia.com>
Date: Fri, 7 May 2021 12:38:22 +0200
Subject: [PATCH] Add option to use the melodic-test branch
---
.gitlab-industrial-ci-kinetic-no-rosinstall.yml | 4 ++--
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 44ed7bb..11b905a 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -40,7 +40,7 @@ industrial_ci_kinetic:
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
except:
- tags
- - melodic-devel
+ - /^melodic-.*/
industrial_ci_melodic:
extends: .industrial_ci
@@ -48,7 +48,7 @@ industrial_ci_melodic:
ROS_DISTRO: melodic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
only:
- - melodic-devel
+ - /melodic-.*/
except:
- tags
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index b582e36..15f0e1e 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -42,7 +42,7 @@ industrial_ci_kinetic:
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
except:
- tags
- - melodic-devel
+ - /^melodic-.*/
industrial_ci_melodic:
extends: .industrial_ci
@@ -50,7 +50,7 @@ industrial_ci_melodic:
ROS_DISTRO: melodic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
only:
- - melodic-devel
+ - /^melodic-.*/
except:
- tags
--
GitLab