From f3acdeea5c9cab1fa412a70fc60881ce3a4b11a0 Mon Sep 17 00:00:00 2001
From: Jon Azpiazu <jon.azpiazu@tecnalia.com>
Date: Fri, 7 May 2021 13:44:21 +0200
Subject: [PATCH] Use wildcards to specify branches
---
.gitlab-industrial-ci-kinetic-no-rosinstall.yml | 6 ++----
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 8ff1f05..cdffd6e 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -40,8 +40,7 @@ industrial_ci_kinetic:
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
except:
- tags
- - melodic-devel
- - melodic-test
+ - melodic-*
industrial_ci_melodic:
extends: .industrial_ci
@@ -49,8 +48,7 @@ industrial_ci_melodic:
ROS_DISTRO: melodic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
only:
- - melodic-devel
- - melodic-test
+ - melodic-*
except:
- tags
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 4e2d9de..ffc3b21 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -42,8 +42,7 @@ industrial_ci_kinetic:
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
except:
- tags
- - melodic-devel
- - melodic-test
+ - melodic-*
industrial_ci_melodic:
extends: .industrial_ci
@@ -51,8 +50,7 @@ industrial_ci_melodic:
ROS_DISTRO: melodic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
only:
- - melodic-devel
- - melodic-test
+ - melodic-*
except:
- tags
--
GitLab