From 22e030e9d13ec87853f56b2fefef2f9b2e204fa7 Mon Sep 17 00:00:00 2001
From: Jon Azpiazu <jon.azpiazu@tecnalia.com>
Date: Mon, 4 Nov 2019 14:44:43 +0100
Subject: [PATCH] Use the variable name for tagged images

---
 .gitlab-industrial-ci-kinetic-no-rosinstall.yml   | 4 ++--
 .gitlab-industrial-ci-kinetic-with-rosinstall.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 14604f2..2631831 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -33,7 +33,7 @@ industrial_ci_kinetic:
   extends: .industrial_ci
   variables:
     ROS_DISTRO: kinetic
-    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:kinetic"
+    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   except:
     - tags
 
@@ -41,7 +41,7 @@ industrial_ci_kinetic_deploy:
   extends: .industrial_ci
   variables:
     ROS_DISTRO: kinetic
-    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel: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:
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 6dc26fa..eb89050 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -35,7 +35,7 @@ industrial_ci_kinetic:
   extends: .industrial_ci
   variables:
     ROS_DISTRO: kinetic
-    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:kinetic"
+    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   except:
     - tags
 
@@ -43,7 +43,7 @@ industrial_ci_kinetic_deploy:
   extends: .industrial_ci
   variables:
     ROS_DISTRO: kinetic
-    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel: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:
-- 
GitLab