Merge branch 'fix-hardcoded-docker-image-name' into 'master'

Fix hardcoded docker image name

See merge request tecnalia_robotics-public/gitlab_templates!13

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

@@ -24,7 +24,7 @@ industrial_ci_kinetic:
   variables:
     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: "tecnalia-robotics.artifact.tecnalia.com/test-robotics/flexbotics-base-devel"
+    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/${ARTIFACT_DOCKER_REGISTRY_NAME}/flexbotics-base-devel"
   when: always
 
 ##########################################################

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

@@ -26,7 +26,7 @@ industrial_ci_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: "tecnalia-robotics.artifact.tecnalia.com/test-robotics/flexbotics-base-devel"
+    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/${ARTIFACT_DOCKER_REGISTRY_NAME}/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"
   when: always