Fix docker image tag to avoid overlapping between distros

ci-templates/industrial-ci-templates.yml

@@ -7,7 +7,7 @@
     - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
   script:
     - .ci_config/gitlab.sh
-    - docker push "${ARTIFACT_DOCKER_URL}/flexbotics-industrial-ci:${CI_COMMIT_SHORT_SHA}"
+    - docker push "${ARTIFACT_DOCKER_URL}/flexbotics-industrial-ci:${ROS_DISTRO}-${CI_COMMIT_SHORT_SHA}"
   variables:
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
     ADDITIONAL_DEBS: curl
@@ -15,7 +15,7 @@
     AFTER_SETUP_TARGET_WORKSPACE: "rosenv && bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$current_ws"
     CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
     NOT_TEST_BUILD: "true"
-    DOCKER_COMMIT: "${ARTIFACT_DOCKER_URL}/flexbotics-industrial-ci:${CI_COMMIT_SHORT_SHA}"
+    DOCKER_COMMIT: "${ARTIFACT_DOCKER_URL}/flexbotics-industrial-ci:${ROS_DISTRO}-${CI_COMMIT_SHORT_SHA}"
     CCACHE_DIR: ${CI_PROJECT_DIR}/ccache
   cache:
     key: "${CI_JOB_NAME}"
@@ -29,11 +29,11 @@ industrial_ci_test_noetic:
     - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config
     - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
     - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
-    - docker pull "${ARTIFACT_DOCKER_URL}/flexbotics-industrial-ci:${CI_COMMIT_SHORT_SHA}"
+    - docker pull "${ARTIFACT_DOCKER_URL}/flexbotics-industrial-ci:${ROS_DISTRO}-${CI_COMMIT_SHORT_SHA}"
   script:
     - .ci_config/gitlab.sh
   variables:
-    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-industrial-ci:${CI_COMMIT_SHORT_SHA}"
+    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-industrial-ci:${ROS_DISTRO}-${CI_COMMIT_SHORT_SHA}"
     ADDITIONAL_DEBS: curl
     PARALLEL_BUILDS: 2 # keep this for now, since there seems to be memory limit issues in the ci VM
     CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context