From 6e1494fd5747be4d9bff42d3ded28b8ad372d3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Moreno?= <inigo.moreno@tecnalia.com> Date: Fri, 10 Sep 2021 13:37:31 +0200 Subject: [PATCH] Re-reorganize --- ...ab-industrial-ci-kinetic-no-rosinstall.yml | 5 +- ...-industrial-ci-kinetic-with-rosinstall.yml | 5 +- ...ab-industrial-ci-melodic-no-rosinstall.yml | 4 - ...-industrial-ci-melodic-with-rosinstall.yml | 4 - .gitlab-industrial-ci-no-rosinstall.yml | 142 ------------------ ...lab-industrial-ci-noetic-no-rosinstall.yml | 4 - ...b-industrial-ci-noetic-with-rosinstall.yml | 4 - .gitlab-industrial-ci-with-rosinstall.yml | 19 --- auto-rules/kinetic-default.yml | 4 + auto-rules/melodic-default.yml | 4 + auto-rules/no-default.yml | 89 +++++++++++ auto-rules/noetic-default.yml | 4 + .../with-rosinstall/kinetic-default.yml | 4 + .../with-rosinstall/melodic-default.yml | 4 + auto-rules/with-rosinstall/no-default.yml | 6 + auto-rules/with-rosinstall/noetic-default.yml | 4 + core.yml | 31 ++++ industrial-ci-templates.yml | 0 gitlab-ci/post-check.yml => post-check.yml | 0 19 files changed, 152 insertions(+), 185 deletions(-) delete mode 100644 .gitlab-industrial-ci-melodic-no-rosinstall.yml delete mode 100644 .gitlab-industrial-ci-melodic-with-rosinstall.yml delete mode 100644 .gitlab-industrial-ci-no-rosinstall.yml delete mode 100644 .gitlab-industrial-ci-noetic-no-rosinstall.yml delete mode 100644 .gitlab-industrial-ci-noetic-with-rosinstall.yml delete mode 100644 .gitlab-industrial-ci-with-rosinstall.yml create mode 100644 auto-rules/kinetic-default.yml create mode 100644 auto-rules/melodic-default.yml create mode 100644 auto-rules/no-default.yml create mode 100644 auto-rules/noetic-default.yml create mode 100644 auto-rules/with-rosinstall/kinetic-default.yml create mode 100644 auto-rules/with-rosinstall/melodic-default.yml create mode 100644 auto-rules/with-rosinstall/no-default.yml create mode 100644 auto-rules/with-rosinstall/noetic-default.yml create mode 100644 core.yml create mode 100644 industrial-ci-templates.yml rename gitlab-ci/post-check.yml => post-check.yml (100%) diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index f8ed382..75393ed 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -1,4 +1 @@ -include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/.gitlab-industrial-ci-no-rosinstall.yml' - -variables: - DEFAULT_DISTRO: kinetic \ No newline at end of file +include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/kinetic-default.yml' \ No newline at end of file diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml index 4a367e3..366ea7a 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -1,4 +1 @@ -include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/.gitlab-industrial-ci-with-rosinstall.yml' - -variables: - DEFAULT_DISTRO: kinetic \ No newline at end of file +include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/with_rosinstall/kinetic-default.yml' \ No newline at end of file diff --git a/.gitlab-industrial-ci-melodic-no-rosinstall.yml b/.gitlab-industrial-ci-melodic-no-rosinstall.yml deleted file mode 100644 index 99ab207..0000000 --- a/.gitlab-industrial-ci-melodic-no-rosinstall.yml +++ /dev/null @@ -1,4 +0,0 @@ -include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/.gitlab-industrial-ci-no-rosinstall.yml' - -variables: - DEFAULT_DISTRO: melodic \ No newline at end of file diff --git a/.gitlab-industrial-ci-melodic-with-rosinstall.yml b/.gitlab-industrial-ci-melodic-with-rosinstall.yml deleted file mode 100644 index cd3db8a..0000000 --- a/.gitlab-industrial-ci-melodic-with-rosinstall.yml +++ /dev/null @@ -1,4 +0,0 @@ -include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/.gitlab-industrial-ci-with-rosinstall.yml' - -variables: - DEFAULT_DISTRO: melodic \ No newline at end of file diff --git a/.gitlab-industrial-ci-no-rosinstall.yml b/.gitlab-industrial-ci-no-rosinstall.yml deleted file mode 100644 index a893c92..0000000 --- a/.gitlab-industrial-ci-no-rosinstall.yml +++ /dev/null @@ -1,142 +0,0 @@ -image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git - -variables: - TMPDIR: /builds/${CI_PROJECT_NAMESPACE} - GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch - -services: - - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind - alias: docker - -stages: - - build - -workflow: - rules: - - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^kinetic-.*/ - variables: - DEFAULT_DISTRO: "kinetic" - - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^melodic-.*/ - variables: - DEFAULT_DISTRO: "melodic" - - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^noetic-.*/ - variables: - DEFAULT_DISTRO: "noetic" - - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_NAME =~ /^kinetic-.*/ - variables: - DEFAULT_DISTRO: "kinetic" - DEPLOY: "true" - - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_NAME =~ /^melodic-.*/ - variables: - DEFAULT_DISTRO: "melodic" - DEPLOY: "true" - - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_NAME =~ /^noetic-.*/ - variables: - DEFAULT_DISTRO: "noetic" - DEPLOY: "true" - - if: $CI_COMMIT_TAG - variables: - DEPLOY: "true" - - if: $CI_COMMIT_BRANCH - -before_script: - - apk add --update bash coreutils tar wget - - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN} - -.industrial_ci: - stage: build - 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} - script: .ci_config/gitlab.sh - variables: - 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 - tags: - - docker - -industrial_ci_kinetic: - extends: .industrial_ci - variables: - ROS_DISTRO: kinetic - DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" - rules: - - if: $DEPLOY - when: never - - if: $DEFAULT_DISTRO == "kinetic" - - if: $BUILD_KINETIC - -industrial_ci_melodic: - extends: .industrial_ci - variables: - ROS_DISTRO: melodic - DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" - rules: - - if: $DEPLOY - when: never - - if: $DEFAULT_DISTRO == "melodic" - - if: $BUILD_MELODIC - -industrial_ci_noetic: - extends: .industrial_ci - variables: - ROS_DISTRO: noetic - DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" - rules: - - if: $DEPLOY - when: never - - if: $DEFAULT_DISTRO == "noetic" - - if: $BUILD_NOETIC - -.industrial_ci_deploy: - extends: .industrial_ci - variables: - 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: - - .ci_config/gitlab.sh - - cd $(mktemp -d) - - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/archive/master/gitlab_templates-master.zip - - unzip gitlab_templates-master.zip && cd gitlab_templates-master/deploy - - cd base - - chmod a+x ros_entrypoint.bash - - docker build -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} . - - docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} - - cd .. - - cd dev - - docker build --build-arg APPLICATION_IMAGE=${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev . - - docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev - - cd .. - rules: - - if: $DEPLOY - - -industrial_kinetic_deploy: - extends: - - industrial_ci_kinetic - - .industrial_ci_deploy - rules: - - if: $DEPLOY && $DEFAULT_DISTRO == "kinetic" - - if: $DEPLOY && $BUILD_KINETIC - -industrial_melodic_deploy: - extends: - - industrial_ci_melodic - - .industrial_ci_deploy - rules: - - if: $DEPLOY && $DEFAULT_DISTRO == "melodic" - - if: $DEPLOY && $BUILD_MELODIC - -industrial_noetic_deploy: - extends: - - industrial_ci_noetic - - .industrial_ci_deploy - rules: - - if: $DEPLOY && $DEFAULT_DISTRO == "noetic" - - if: $DEPLOY && $BUILD_NOETIC - -include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/gitlab-ci/post-check.yml' \ No newline at end of file diff --git a/.gitlab-industrial-ci-noetic-no-rosinstall.yml b/.gitlab-industrial-ci-noetic-no-rosinstall.yml deleted file mode 100644 index 342021a..0000000 --- a/.gitlab-industrial-ci-noetic-no-rosinstall.yml +++ /dev/null @@ -1,4 +0,0 @@ -include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/.gitlab-industrial-ci-no-rosinstall.yml' - -variables: - DEFAULT_DISTRO: noetic \ No newline at end of file diff --git a/.gitlab-industrial-ci-noetic-with-rosinstall.yml b/.gitlab-industrial-ci-noetic-with-rosinstall.yml deleted file mode 100644 index 6c4cc86..0000000 --- a/.gitlab-industrial-ci-noetic-with-rosinstall.yml +++ /dev/null @@ -1,4 +0,0 @@ -include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/.gitlab-industrial-ci-with-rosinstall.yml' - -variables: - DEFAULT_DISTRO: noetic \ No newline at end of file diff --git a/.gitlab-industrial-ci-with-rosinstall.yml b/.gitlab-industrial-ci-with-rosinstall.yml deleted file mode 100644 index a3fa130..0000000 --- a/.gitlab-industrial-ci-with-rosinstall.yml +++ /dev/null @@ -1,19 +0,0 @@ -include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/.gitlab-industrial-ci-kinetic-no-rosinstall.yml' - -.industrial_ci: - stage: build - 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} - script: .ci_config/gitlab.sh - variables: - ADDITIONAL_DEBS: curl - PARALLEL_BUILDS: 2 # keep this for now, since there seems to be memory limit issues in the ci VM - UPSTREAM_WORKSPACE: .rosinstall - AFTER_SETUP_UPSTREAM_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" - 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' - tags: - - docker \ No newline at end of file diff --git a/auto-rules/kinetic-default.yml b/auto-rules/kinetic-default.yml new file mode 100644 index 0000000..0c04cd5 --- /dev/null +++ b/auto-rules/kinetic-default.yml @@ -0,0 +1,4 @@ +include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/no-default.yml' + +variables: + DEFAULT_DISTRO: kinetic \ No newline at end of file diff --git a/auto-rules/melodic-default.yml b/auto-rules/melodic-default.yml new file mode 100644 index 0000000..023a8ea --- /dev/null +++ b/auto-rules/melodic-default.yml @@ -0,0 +1,4 @@ +include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/no-default.yml' + +variables: + DEFAULT_DISTRO: melodic \ No newline at end of file diff --git a/auto-rules/no-default.yml b/auto-rules/no-default.yml new file mode 100644 index 0000000..85581fb --- /dev/null +++ b/auto-rules/no-default.yml @@ -0,0 +1,89 @@ +include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/core.yml' + +workflow: + rules: + - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^kinetic-.*/ + variables: + DEFAULT_DISTRO: "kinetic" + - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^melodic-.*/ + variables: + DEFAULT_DISTRO: "melodic" + - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_NAME =~ /^noetic-.*/ + variables: + DEFAULT_DISTRO: "noetic" + - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_NAME =~ /^kinetic-.*/ + variables: + DEFAULT_DISTRO: "kinetic" + DEPLOY: "true" + - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_NAME =~ /^melodic-.*/ + variables: + DEFAULT_DISTRO: "melodic" + DEPLOY: "true" + - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_NAME =~ /^noetic-.*/ + variables: + DEFAULT_DISTRO: "noetic" + DEPLOY: "true" + - if: $CI_COMMIT_TAG + variables: + DEPLOY: "true" + - if: $CI_COMMIT_BRANCH + + +industrial_ci_kinetic: + extends: .industrial_ci + variables: + ROS_DISTRO: kinetic + DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" + rules: + - if: $DEPLOY + when: never + - if: $DEFAULT_DISTRO == "kinetic" + - if: $BUILD_KINETIC + +industrial_ci_melodic: + extends: .industrial_ci + variables: + ROS_DISTRO: melodic + DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" + rules: + - if: $DEPLOY + when: never + - if: $DEFAULT_DISTRO == "melodic" + - if: $BUILD_MELODIC + +industrial_ci_noetic: + extends: .industrial_ci + variables: + ROS_DISTRO: noetic + DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" + rules: + - if: $DEPLOY + when: never + - if: $DEFAULT_DISTRO == "noetic" + - if: $BUILD_NOETIC + + + +industrial_kinetic_deploy: + extends: + - industrial_ci_kinetic + - .industrial_ci_deploy + rules: + - if: $DEPLOY && $DEFAULT_DISTRO == "kinetic" + - if: $DEPLOY && $BUILD_KINETIC + +industrial_melodic_deploy: + extends: + - industrial_ci_melodic + - .industrial_ci_deploy + rules: + - if: $DEPLOY && $DEFAULT_DISTRO == "melodic" + - if: $DEPLOY && $BUILD_MELODIC + +industrial_noetic_deploy: + extends: + - industrial_ci_noetic + - .industrial_ci_deploy + rules: + - if: $DEPLOY && $DEFAULT_DISTRO == "noetic" + - if: $DEPLOY && $BUILD_NOETIC diff --git a/auto-rules/noetic-default.yml b/auto-rules/noetic-default.yml new file mode 100644 index 0000000..8239a71 --- /dev/null +++ b/auto-rules/noetic-default.yml @@ -0,0 +1,4 @@ +include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/no-default.yml' + +variables: + DEFAULT_DISTRO: noetic \ No newline at end of file diff --git a/auto-rules/with-rosinstall/kinetic-default.yml b/auto-rules/with-rosinstall/kinetic-default.yml new file mode 100644 index 0000000..20f6e8a --- /dev/null +++ b/auto-rules/with-rosinstall/kinetic-default.yml @@ -0,0 +1,4 @@ +include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/with-rosinstall/no-default.yml' + +variables: + DEFAULT_DISTRO: kinetic \ No newline at end of file diff --git a/auto-rules/with-rosinstall/melodic-default.yml b/auto-rules/with-rosinstall/melodic-default.yml new file mode 100644 index 0000000..69519f9 --- /dev/null +++ b/auto-rules/with-rosinstall/melodic-default.yml @@ -0,0 +1,4 @@ +include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/with-rosinstall/no-default.yml' + +variables: + DEFAULT_DISTRO: melodic \ No newline at end of file diff --git a/auto-rules/with-rosinstall/no-default.yml b/auto-rules/with-rosinstall/no-default.yml new file mode 100644 index 0000000..cdc30c9 --- /dev/null +++ b/auto-rules/with-rosinstall/no-default.yml @@ -0,0 +1,6 @@ +include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/no-default' + + +.industrial_ci: + variables: + UPSTREAM_WORKSPACE: .rosinstall \ No newline at end of file diff --git a/auto-rules/with-rosinstall/noetic-default.yml b/auto-rules/with-rosinstall/noetic-default.yml new file mode 100644 index 0000000..bf3d10c --- /dev/null +++ b/auto-rules/with-rosinstall/noetic-default.yml @@ -0,0 +1,4 @@ +include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/with-rosinstall/no-default.yml' + +variables: + DEFAULT_DISTRO: noetic \ No newline at end of file diff --git a/core.yml b/core.yml new file mode 100644 index 0000000..6f71cf5 --- /dev/null +++ b/core.yml @@ -0,0 +1,31 @@ + +image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git + + +workflow: + rules: + - if: $CI_COMMIT_TAG + - if: $CI_COMMIT_BRANCH + +variables: + TMPDIR: /builds/${CI_PROJECT_NAMESPACE} + GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch + +services: + - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind + alias: docker + +stages: + - build + +before_script: + - apk add --update bash coreutils tar wget + - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN} + +include : + - project: tecnalia_robotics-public/gitlab_templates + ref: 35-improve-ci-template-organization + file: + - post-check.yml + - industrial-ci-templates.yml + diff --git a/industrial-ci-templates.yml b/industrial-ci-templates.yml new file mode 100644 index 0000000..e69de29 diff --git a/gitlab-ci/post-check.yml b/post-check.yml similarity index 100% rename from gitlab-ci/post-check.yml rename to post-check.yml -- GitLab