From cb9ae8c1a384fdc86e289e41605a83f4042c73e8 Mon Sep 17 00:00:00 2001 From: Jon Azpiazu <jon.azpiazu@tecnalia.com> Date: Wed, 18 May 2022 12:27:23 +0200 Subject: [PATCH] Quick example trying to split build and test jobs --- ci-templates/industrial-ci-templates.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml index 4281ca8..7faf566 100644 --- a/ci-templates/industrial-ci-templates.yml +++ b/ci-templates/industrial-ci-templates.yml @@ -5,14 +5,35 @@ - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN} - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN} - script: .ci_config/gitlab.sh + script: + - .ci_config/gitlab.sh + - docker push "${ARTIFACT_DOCKER_URL}/flexbotics-industrial-ci:${CI_COMMIT_SHORT_SHA}" 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" CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context + NOT_TEST_BUILD: true + DOCKER_COMMIT: "${ARTIFACT_DOCKER_URL}/flexbotics-industrial-ci:${CI_COMMIT_SHORT_SHA}" +industrial_ci_test_noetic: + state: .post + before_script: + - apk add --update bash coreutils tar + - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config + - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN} + - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN} + - docker pull "${ARTIFACT_DOCKER_URL}/flexbotics-industrial-ci:${CI_COMMIT_SHORT_SHA}" + 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 + CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context + ROS_DISTRO: noetic + UPSTREAM_WORKSPACE: .rosinstall .ddeploy: stage: deploy -- GitLab