Skip to content
Snippets Groups Projects
Commit 22e030e9 authored by Jon Azpiazu's avatar Jon Azpiazu
Browse files

Use the variable name for tagged images

parent c7fa72ba
Branches
Tags
1 merge request!27Use the tagged docker images according to the rosdistro
Show whitespace changes
Inline Side-by-side
.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+ 2
− 2
View file @ 22e030e9
...@@ -33,7 +33,7 @@ industrial_ci_kinetic: ...@@ -33,7 +33,7 @@ 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:kinetic" DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
except: except:
- tags - tags
...@@ -41,7 +41,7 @@ industrial_ci_kinetic_deploy: ...@@ -41,7 +41,7 @@ industrial_ci_kinetic_deploy:
extends: .industrial_ci extends: .industrial_ci
variables: variables:
ROS_DISTRO: kinetic 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" 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 DOCKER_COMMIT: industrial_ci_image
script: script:
......
.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+ 2
− 2
View file @ 22e030e9
...@@ -35,7 +35,7 @@ industrial_ci_kinetic: ...@@ -35,7 +35,7 @@ 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:kinetic" DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
except: except:
- tags - tags
...@@ -43,7 +43,7 @@ industrial_ci_kinetic_deploy: ...@@ -43,7 +43,7 @@ industrial_ci_kinetic_deploy:
extends: .industrial_ci extends: .industrial_ci
variables: variables:
ROS_DISTRO: kinetic 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" 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 DOCKER_COMMIT: industrial_ci_image
script: script:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment