Merge branch 'common_config/19-change-image-naming-scheme' into 'master'

Use new image naming scheme for docker images

Closes tecnalia_robotics/common_config#19

See merge request tecnalia_robotics-public/gitlab_templates!19

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

@@ -25,7 +25,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: "${ARTIFACT_DOCKER_URL}/${ARTIFACT_DOCKER_REGISTRY_NAME}/flexbotics-base-devel"
+    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"
     CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
   when: always

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

@@ -27,7 +27,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: "${ARTIFACT_DOCKER_URL}/${ARTIFACT_DOCKER_REGISTRY_NAME}/flexbotics-base-devel"
+    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"
     CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
   when: always