From c6efb51d9082d67b0f897c4c3676c66820c7c945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Moreno?= <inigo.moreno@tecnalia.com>
Date: Tue, 21 Sep 2021 11:23:27 +0200
Subject: [PATCH] Move DOCKER_IMAGE to template
---
ci-templates/auto-rules/no-default.yml | 3 ---
ci-templates/industrial-ci-templates.yml | 1 +
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/ci-templates/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml
index 8596c1b..a2f6a98 100644
--- a/ci-templates/auto-rules/no-default.yml
+++ b/ci-templates/auto-rules/no-default.yml
@@ -33,7 +33,6 @@ industrial_ci_kinetic:
extends: .industrial_ci
variables:
ROS_DISTRO: kinetic
- DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules:
- if: $DEPLOY
when: never
@@ -44,7 +43,6 @@ industrial_ci_melodic:
extends: .industrial_ci
variables:
ROS_DISTRO: melodic
- DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules:
- if: $DEPLOY
when: never
@@ -55,7 +53,6 @@ industrial_ci_noetic:
extends: .industrial_ci
variables:
ROS_DISTRO: noetic
- DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules:
- if: $DEPLOY
when: never
diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
index c22f9cb..9f2516f 100644
--- a/ci-templates/industrial-ci-templates.yml
+++ b/ci-templates/industrial-ci-templates.yml
@@ -8,6 +8,7 @@
- docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
script: .ci_config/gitlab.sh
variables:
+ DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
ADDITIONAL_DEBS: curl
PARALLEL_BUILDS: 2 # keep this for now, since there seems to be memory limit issues in the ci VM
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"
--
GitLab