From 8baccd319ca8e93b03d93e9c55bc640feb31dcd1 Mon Sep 17 00:00:00 2001
From: Miguel Prada <miguel.prada@tecnalia.com>
Date: Fri, 15 Nov 2019 14:23:41 +0100
Subject: [PATCH] Explicitly point to legacy branch of industrial_ci
This is the most conservative approach, and allows us to switch to
master only when we explicitly decide to do so.
---
.gitlab-industrial-ci-kinetic-no-rosinstall.yml | 2 +-
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 7d760c1..aeba5b7 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -19,7 +19,7 @@ before_script:
stage: build
before_script:
- apk add --update bash coreutils tar
- - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b master
+ - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
- docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
script: .ci_config/gitlab.sh
variables:
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index cec1d67..98a9832 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -19,7 +19,7 @@ before_script:
stage: build
before_script:
- apk add --update bash coreutils tar
- - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b master
+ - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
- docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
script: .ci_config/gitlab.sh
variables:
--
GitLab