From 01f2ad7e2bd4cb2c012464c177da3afa9acb00b1 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
---
...ab-industrial-ci-kinetic-no-rosinstall.yml | 21 ++++++++++--------
...-industrial-ci-kinetic-with-rosinstall.yml | 22 ++++++++++---------
2 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 11b905a..5d3dbcd 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -38,19 +38,22 @@ industrial_ci_kinetic:
variables:
ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
- except:
- - tags
- - /^melodic-.*/
+ rules:
+ - if: $CI_COMMIT_TAG
+ when: never
+ - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
+ 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_TAG
+ when: never
+ - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
industrial_ci_kinetic_deploy:
extends: .industrial_ci
@@ -73,8 +76,8 @@ industrial_ci_kinetic_deploy:
- docker build --build-arg APPLICATION_IMAGE=${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev .
- docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev
- cd ..
- only:
- - tags
+ rules:
+ - if: $CI_COMMIT_TAG
clang_format:
stage: postcheck
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 15f0e1e..7e44d49 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -31,7 +31,6 @@ before_script:
ROSINSTALL_FILENAME: ".rosinstall"
BEFORE_SCRIPT: "bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE"
CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
- when: always
tags:
- docker
@@ -40,19 +39,22 @@ industrial_ci_kinetic:
variables:
ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
- except:
- - tags
- - /^melodic-.*/
+ rules:
+ - if: $CI_COMMIT_TAG
+ when: never
+ - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
+ 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_TAG
+ when: never
+ - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
industrial_ci_kinetic_deploy:
extends: .industrial_ci
@@ -75,8 +77,8 @@ industrial_ci_kinetic_deploy:
- docker build --build-arg APPLICATION_IMAGE=${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev .
- docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev
- cd ..
- only:
- - tags
+ rules:
+ - if: $CI_COMMIT_TAG
clang_format:
stage: postcheck
--
GitLab