Commit c7fa72ba authored by Jon Azpiazu's avatar Jon Azpiazu

Use the tagged docker images according to the rosdistro

parent 1494883b
Pipeline #13804 passed with stage
in 35 seconds
......@@ -15,7 +15,7 @@ stages:
before_script:
- apk add --update bash coreutils tar wget python
.industrial_ci_kinetic:
.industrial_ci:
stage: build
before_script:
- apk add --update bash coreutils tar
......@@ -24,21 +24,24 @@ before_script:
script: .ci_config/gitlab.sh
variables:
ADDITIONAL_DEBS: curl
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: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel"
BEFORE_SCRIPT: "bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE"
CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
when: always
industrial_ci_kinetic:
extends: .industrial_ci_kinetic
extends: .industrial_ci
variables:
ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:kinetic"
except:
- tags
industrial_ci_kinetic_deploy:
extends: .industrial_ci_kinetic
extends: .industrial_ci
variables:
ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:kinetic"
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
script:
......
......@@ -15,7 +15,7 @@ stages:
before_script:
- apk add --update bash coreutils tar wget python
.industrial_ci_kinetic:
.industrial_ci:
stage: build
before_script:
- apk add --update bash coreutils tar
......@@ -24,23 +24,26 @@ before_script:
script: .ci_config/gitlab.sh
variables:
ADDITIONAL_DEBS: curl
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: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel"
BEFORE_SCRIPT: "bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE"
CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
when: always
industrial_ci_kinetic:
extends: .industrial_ci_kinetic
extends: .industrial_ci
variables:
ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:kinetic"
except:
- tags
industrial_ci_kinetic_deploy:
extends: .industrial_ci_kinetic
extends: .industrial_ci
variables:
ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:kinetic"
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
script:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment