From 16198fe52d821f0e67d82e51441b402dff798ed2 Mon Sep 17 00:00:00 2001
From: Jon Azpiazu <jon.azpiazu@tecnalia.com>
Date: Mon, 10 May 2021 09:15:24 +0200
Subject: [PATCH] Try to rewrite only/except using rules
---
...b-industrial-ci-kinetic-with-rosinstall.yml | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 15f0e1e..227d32d 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -40,19 +40,23 @@ industrial_ci_kinetic:
variables:
ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
- except:
- - tags
- - /^melodic-.*/
+ rules:
+ - if: '$CI_COMMIT_REF_NAME =~ /^melodic-.*/'
+ when: never
+ - if: $CI_COMMIT_TAG
+ when: never
+ when: always
industrial_ci_melodic:
extends: .industrial_ci
variables:
ROS_DISTRO: melodic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
- only:
- - /^melodic-.*/
- except:
- - tags
+ rules:
+ - if: '$CI_COMMIT_REF_NAME =~ /^melodic-.*/'
+ when: always
+ - if: $CI_COMMIT_TAG
+ when: never
industrial_ci_kinetic_deploy:
extends: .industrial_ci
--
GitLab