Merge branch 'use-tagged-docker-images' into 'master'

Use the tagged docker images according to the rosdistro

See merge request !27

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

@@ -15,7 +15,7 @@ stages:
 before_script:
   - apk add --update bash coreutils tar wget python
 
-.industrial_ci_kinetic:
+.industrial_ci:
   stage: build
   before_script:
     - apk add --update bash coreutils tar
@@ -24,9 +24,7 @@ before_script:
   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: bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE
     CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
   when: always
@@ -34,14 +32,19 @@ before_script:
     - docker
 
 industrial_ci_kinetic:
-  extends: .industrial_ci_kinetic
+  extends: .industrial_ci
+  variables:
+    ROS_DISTRO: kinetic
+    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   except:
     - tags
 
 industrial_ci_kinetic_deploy:
-  extends: .industrial_ci_kinetic
+  extends: .industrial_ci
   variables:
-    AFTER_SCRIPT: wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/pre-deploy-cleanup.bash | bash
+    ROS_DISTRO: kinetic
+    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
+    AFTER_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/pre-deploy-cleanup.bash | bash"
     DOCKER_COMMIT: industrial_ci_image
   script:
     - .ci_config/gitlab.sh

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

@@ -15,7 +15,7 @@ stages:
 before_script:
   - apk add --update bash coreutils tar wget python
 
-.industrial_ci_kinetic:
+.industrial_ci:
   stage: build
   before_script:
     - apk add --update bash coreutils tar
@@ -24,26 +24,29 @@ before_script:
   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
+    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: bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE
-    CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
+    ROSINSTALL_FILENAME: ".rosinstall"
+    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
   tags:
     - docker
 
 industrial_ci_kinetic:
-  extends: .industrial_ci_kinetic
+  extends: .industrial_ci
+  variables:
+    ROS_DISTRO: kinetic
+    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   except:
     - tags
 
 industrial_ci_kinetic_deploy:
-  extends: .industrial_ci_kinetic
+  extends: .industrial_ci
   variables:
-    AFTER_SCRIPT: wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/pre-deploy-cleanup.bash | bash
+    ROS_DISTRO: kinetic
+    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
+    AFTER_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/pre-deploy-cleanup.bash | bash"
     DOCKER_COMMIT: industrial_ci_image
   script:
     - .ci_config/gitlab.sh