Merge branch 'configurable-ci-setup-lookup-path' into 'master'

Lookup CI setup scripts in a argument provided path

See merge request tecnalia_robotics-public/gitlab_templates!23

.gitlab-industrial-ci-kinetic-no-rosinstall.yml

@@ -23,10 +23,11 @@ before_script:
     - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
   script: .ci_config/gitlab.sh
   variables:
+    ADDITIONAL_DEBS: curl
     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: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh | bash"
+    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"
     CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
   when: always
 

.gitlab-industrial-ci-kinetic-with-rosinstall.yml

@@ -23,12 +23,13 @@ before_script:
     - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
   script: .ci_config/gitlab.sh
   variables:
+    ADDITIONAL_DEBS: curl
     ROS_DISTRO: kinetic
     ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM
     UPSTREAM_WORKSPACE: file
     ROSINSTALL_FILENAME: ".rosinstall"
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel"
-    BEFORE_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh | bash"
+    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"
     CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
   when: always
 

scripts/ci_run_entry_points.sh

 #!/bin/bash
 
-find -L $CATKIN_WORKSPACE -name ci_entry_script.bash -exec bash -c 'echo Running entry script from $(basename $(dirname {})) ; {} ' \;
+echo Looking up and executing user entry scripts in: $1
+
+find -L $1 -name ci_entry_script.bash -exec bash -c 'echo Running entry script from $(basename $(dirname {})) ; {} ' \;
 
 echo Finalized running the user entry scripts