diff --git a/ci-templates/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml index 8596c1b75e78b54e958cea494b7c4fe27c19ff2d..a2f6a982abaa0c1dbe538c8fe0efb8894abecf77 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 c22f9cb1958747a9ca58c056f30d4898be84d935..9f2516f5a719cbabb7d93dc82ce22c3148ffc57e 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"