From 9f386e105d4b1260bc58ef046d3b8efc12e2bff0 Mon Sep 17 00:00:00 2001 From: Miguel Prada Date: Wed, 15 May 2019 11:26:48 +0200 Subject: [PATCH] Point to ci_run_entry_points.sh in MR branch, for testing --- .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 e4d384d..fe6a114 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -27,7 +27,7 @@ before_script: ROS_DISTRO: kinetic ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel" - 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" + BEFORE_SCRIPT: "bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/configurable-ci-setup-lookup-path/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 diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml index 13314ad..3584194 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -29,7 +29,7 @@ before_script: UPSTREAM_WORKSPACE: file ROSINSTALL_FILENAME: ".rosinstall" DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel" - 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" + BEFORE_SCRIPT: "bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/configurable-ci-setup-lookup-path/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 -- GitLab