diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml index 3b55be421d8321ce8f7912f201ec38da6199259c..722524763dace2efc0df4d30fce0803fdb4d865b 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -14,7 +14,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 @@ -22,12 +22,26 @@ industrial_ci_kinetic: - 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 + +industrial_ci_kinetic: + extends: .industrial_ci + only: + - kinetic-devel + variables: + ROS_DISTRO: kinetic + DOCKER_IMAGE: "tecnalia-robotics.artifact.tecnalia.com/test-robotics/flexbotics-base-devel" + +industrial_ci_kinetic_fast: + extends: .industrial_ci + except: + - kinetic-devel + variables: + ROS_DISTRO: kinetic + DOCKER_IMAGE: "tecnalia-robotics.artifact.tecnalia.com/test-robotics/flexbotics-fat-devel" ########################################################## ## Simple check for basic Python syntax errors; this is much less thorough than