From 92da81d92b6e3357baa5e9d2663e26779d5e39c5 Mon Sep 17 00:00:00 2001
From: Jon Azpiazu <jon.azpiazu@tecnalia.com>
Date: Fri, 3 Sep 2021 09:29:26 +0200
Subject: [PATCH] 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