Skip to content
Snippets Groups Projects

Use the tagged docker images according to the rosdistro

Merged Jon Azpiazu requested to merge use-tagged-docker-images into master
2 files
+ 22
16
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -15,7 +15,7 @@ stages:
@@ -15,7 +15,7 @@ stages:
before_script:
before_script:
- apk add --update bash coreutils tar wget python
- apk add --update bash coreutils tar wget python
.industrial_ci_kinetic:
.industrial_ci:
stage: build
stage: build
before_script:
before_script:
- apk add --update bash coreutils tar
- apk add --update bash coreutils tar
@@ -24,9 +24,7 @@ before_script:
@@ -24,9 +24,7 @@ before_script:
script: .ci_config/gitlab.sh
script: .ci_config/gitlab.sh
variables:
variables:
ADDITIONAL_DEBS: curl
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
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
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
CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
when: always
when: always
@@ -34,14 +32,19 @@ before_script:
@@ -34,14 +32,19 @@ before_script:
- docker
- docker
industrial_ci_kinetic:
industrial_ci_kinetic:
extends: .industrial_ci_kinetic
extends: .industrial_ci
 
variables:
 
ROS_DISTRO: kinetic
 
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
except:
except:
- tags
- tags
industrial_ci_kinetic_deploy:
industrial_ci_kinetic_deploy:
extends: .industrial_ci_kinetic
extends: .industrial_ci
variables:
variables:
AFTER_SCRIPT: wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/pre-deploy-cleanup.bash | bash
ROS_DISTRO: 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"
DOCKER_COMMIT: industrial_ci_image
DOCKER_COMMIT: industrial_ci_image
script:
script:
- .ci_config/gitlab.sh
- .ci_config/gitlab.sh
Loading