From f213dc459ea0119ec38fa3fb3a0f9eda8f79ee8f Mon Sep 17 00:00:00 2001
From: Miguel Prada <miguel.prada@tecnalia.com>
Date: Fri, 1 Mar 2019 09:41:40 +0100
Subject: [PATCH] Small tweaks to allow testing from branch
---
.gitlab-industrial-ci-kinetic-no-rosinstall.yml | 4 ++--
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 2c5ecf6..caaef6e 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -43,8 +43,8 @@ industrial_ci_kinetic_deploy:
script:
- .ci_config/gitlab.sh
- cd $(mktemp -d)
- - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/archive/master/gitlab_templates-master.zip
- - unzip gitlab_templates-master.zip && cd gitlab_templates-master/deploy
+ - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/archive/dev-image-test/gitlab_templates-dev-image-test.zip
+ - unzip gitlab_templates-dev-image-test.zip && cd gitlab_templates-dev-image-test/deploy
- cd base
- chmod a+x ros_entrypoint.bash
- docker build -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} .
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index c63dc7f..c4d182f 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -45,8 +45,8 @@ industrial_ci_kinetic_deploy:
script:
- .ci_config/gitlab.sh
- cd $(mktemp -d)
- - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/archive/master/gitlab_templates-master.zip
- - unzip gitlab_templates-master.zip && cd gitlab_templates-master/deploy
+ - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/archive/dev-image-test/gitlab_templates-dev-image-test.zip
+ - unzip gitlab_templates-dev-image-test.zip && cd gitlab_templates-dev-image-test/deploy
- cd base
- chmod a+x ros_entrypoint.bash
- docker build -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} .
--
GitLab