From 383b123eb3b8c9d5515f4b47806181359dfb7e7d Mon Sep 17 00:00:00 2001 From: Jon Azpiazu <jon.azpiazu@tecnalia.com> Date: Fri, 7 May 2021 12:38:22 +0200 Subject: [PATCH] Add option to use the melodic-test branch --- .gitlab-industrial-ci-kinetic-no-rosinstall.yml | 2 ++ .gitlab-industrial-ci-kinetic-with-rosinstall.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index 44ed7bb..8ff1f05 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -41,6 +41,7 @@ industrial_ci_kinetic: except: - tags - melodic-devel + - melodic-test industrial_ci_melodic: extends: .industrial_ci @@ -49,6 +50,7 @@ industrial_ci_melodic: DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" only: - melodic-devel + - melodic-test except: - tags diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml index b582e36..4e2d9de 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -43,6 +43,7 @@ industrial_ci_kinetic: except: - tags - melodic-devel + - melodic-test industrial_ci_melodic: extends: .industrial_ci @@ -51,6 +52,7 @@ industrial_ci_melodic: DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" only: - melodic-devel + - melodic-test except: - tags -- GitLab