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

Merge branch 'fix-hardcoded-docker-image-name' into 'master'

Fix hardcoded docker image name

See merge request !13
parents 68ad8d17 f7bdb39c
No related branches found
No related tags found
1 merge request!13Fix hardcoded docker image name
...@@ -24,7 +24,7 @@ industrial_ci_kinetic: ...@@ -24,7 +24,7 @@ industrial_ci_kinetic:
variables: variables:
ROS_DISTRO: kinetic ROS_DISTRO: kinetic
ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM
DOCKER_IMAGE: "tecnalia-robotics.artifact.tecnalia.com/test-robotics/flexbotics-base-devel" DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/${ARTIFACT_DOCKER_REGISTRY_NAME}/flexbotics-base-devel"
when: always when: always
########################################################## ##########################################################
......
...@@ -26,7 +26,7 @@ industrial_ci_kinetic: ...@@ -26,7 +26,7 @@ industrial_ci_kinetic:
ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM
UPSTREAM_WORKSPACE: file UPSTREAM_WORKSPACE: file
ROSINSTALL_FILENAME: ".rosinstall" ROSINSTALL_FILENAME: ".rosinstall"
DOCKER_IMAGE: "tecnalia-robotics.artifact.tecnalia.com/test-robotics/flexbotics-base-devel" DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/${ARTIFACT_DOCKER_REGISTRY_NAME}/flexbotics-base-devel"
BEFORE_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh | bash" BEFORE_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh | bash"
when: always when: always
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment