Skip to content
Snippets Groups Projects
Commit c6efb51d authored by Iñigo Moreno i Caireta's avatar Iñigo Moreno i Caireta
Browse files

Move DOCKER_IMAGE to template

parent 6dad3be5
No related branches found
No related tags found
1 merge request!64Resolve "Improve CI template organization"
Pipeline #56844 failed
...@@ -33,7 +33,6 @@ industrial_ci_kinetic: ...@@ -33,7 +33,6 @@ industrial_ci_kinetic:
extends: .industrial_ci extends: .industrial_ci
variables: variables:
ROS_DISTRO: kinetic ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules: rules:
- if: $DEPLOY - if: $DEPLOY
when: never when: never
...@@ -44,7 +43,6 @@ industrial_ci_melodic: ...@@ -44,7 +43,6 @@ industrial_ci_melodic:
extends: .industrial_ci extends: .industrial_ci
variables: variables:
ROS_DISTRO: melodic ROS_DISTRO: melodic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules: rules:
- if: $DEPLOY - if: $DEPLOY
when: never when: never
...@@ -55,7 +53,6 @@ industrial_ci_noetic: ...@@ -55,7 +53,6 @@ industrial_ci_noetic:
extends: .industrial_ci extends: .industrial_ci
variables: variables:
ROS_DISTRO: noetic ROS_DISTRO: noetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules: rules:
- if: $DEPLOY - if: $DEPLOY
when: never when: never
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
- docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN} - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
script: .ci_config/gitlab.sh script: .ci_config/gitlab.sh
variables: variables:
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
ADDITIONAL_DEBS: curl ADDITIONAL_DEBS: curl
PARALLEL_BUILDS: 2 # keep this for now, since there seems to be memory limit issues in the ci VM 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" 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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment