diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index db848dd6e89c1a8e20d89672efd3433b85ebb801..4f7fc2c4bcb617401c953ea0ba6a6073cdef7503 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -19,10 +19,12 @@ industrial_ci_kinetic: before_script: - apk add --update bash coreutils tar - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config + - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN} script: .ci_config/gitlab.sh variables: ROS_DISTRO: kinetic 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" when: always ########################################################## diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml index 82c4d2b2135bdee130d4c29bbc10321064970576..3b55be421d8321ce8f7912f201ec38da6199259c 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -19,12 +19,14 @@ industrial_ci_kinetic: before_script: - apk add --update bash coreutils tar - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config + - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN} script: .ci_config/gitlab.sh variables: ROS_DISTRO: kinetic ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM UPSTREAM_WORKSPACE: file ROSINSTALL_FILENAME: ".rosinstall" + DOCKER_IMAGE: "tecnalia-robotics.artifact.tecnalia.com/test-robotics/flexbotics-base-devel" when: always ##########################################################