From 3c6ca5d2027f11dcc7b70bf4ddb5f5c77289bcc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Moreno?= <inigo.moreno@tecnalia.com> Date: Mon, 6 Sep 2021 10:00:55 +0200 Subject: [PATCH] Update deploy rules --- ...ab-industrial-ci-kinetic-no-rosinstall.yml | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index b3be1cc..f5be763 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -95,11 +95,9 @@ industrial_ci_noetic: - if: $DEFAULT_DISTRO == "noetic" - if: $BUILD_NOETIC -industrial_ci_kinetic_deploy: +.industrial_ci_deploy: extends: .industrial_ci variables: - ROS_DISTRO: kinetic - DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" AFTER_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/pre-deploy-cleanup.bash | bash" DOCKER_COMMIT: industrial_ci_image script: @@ -119,4 +117,29 @@ industrial_ci_kinetic_deploy: rules: - if: $DEPLOY + +industrial_kinetic_deploy: + extends: + - industrial_ci_kinetic + - .industrial_ci_deploy + rules: + - if: $DEPLOY && $DEFAULT_DISTRO == "kinetic" + - if: $DEPLOY && $BUILD_KINETIC + +industrial_melodic_deploy: + extends: + - industrial_ci_melodic + - .industrial_ci_deploy + rules: + - if: $DEPLOY && $DEFAULT_DISTRO == "melodic" + - if: $DEPLOY && $BUILD_MELODIC + +industrial_noetic_deploy: + extends: + - industrial_ci_noetic + - .industrial_ci_deploy + rules: + - if: $DEPLOY && $DEFAULT_DISTRO == "noetic" + - if: $DEPLOY && $BUILD_NOETIC + include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/gitlab-ci/post-check.yml' \ No newline at end of file -- GitLab