From 71a4e0c1f9f7496dabf9cd18049419bc3b4eabf3 Mon Sep 17 00:00:00 2001
From: Miguel Prada <miguel.prada@tecnalia.com>
Date: Fri, 8 Nov 2019 09:58:40 +0100
Subject: [PATCH] Run melodic job (and not kinetic) only for branches named
 melodic-devel

---
 .gitlab-industrial-ci-kinetic-no-rosinstall.yml   | 3 +++
 .gitlab-industrial-ci-kinetic-with-rosinstall.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 1595d88..78fa497 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -38,12 +38,15 @@ industrial_ci_kinetic:
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   except:
     - tags
+    - melodic-devel
 
 industrial_ci_melodic:
   extends: .industrial_ci
   variables:
     ROS_DISTRO: melodic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
+  only:
+    - melodic-devel
   except:
     - tags
   allow_failure: yes
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index e9bca39..4579b4b 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -40,12 +40,15 @@ industrial_ci_kinetic:
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   except:
     - tags
+    - melodic-devel
 
 industrial_ci_melodic:
   extends: .industrial_ci
   variables:
     ROS_DISTRO: melodic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
+  only:
+    - melodic-devel
   except:
     - tags
   allow_failure: yes
-- 
GitLab