From 6f776a62bb9814604c8c1142c8c374c56484bcdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Moreno?= <inigo.moreno@tecnalia.com>
Date: Mon, 6 Sep 2021 09:27:08 +0200
Subject: [PATCH] With rosinstall now just includes no rosinstall
---
...-industrial-ci-kinetic-with-rosinstall.yml | 84 +------------------
1 file changed, 2 insertions(+), 82 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index c195c36..a3fa130 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -1,24 +1,4 @@
-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_TAG
- - 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}
+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
@@ -36,64 +16,4 @@ before_script:
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: $CI_COMMIT_TAG
- when: never
- - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
- when: never
- - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/
- when: never
- - when: always
-
-industrial_ci_melodic:
- extends: .industrial_ci
- variables:
- ROS_DISTRO: melodic
- DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
- rules:
- - if: $CI_COMMIT_TAG
- when: never
- - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
-
-industrial_ci_noetic:
- extends: .industrial_ci
- variables:
- ROS_DISTRO: noetic
- DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
- rules:
- - if: $CI_COMMIT_TAG
- when: never
- - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/
-
-industrial_ci_kinetic_deploy:
- extends: .industrial_ci
- variables:
- 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
- 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: $CI_COMMIT_TAG
-
-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
+ - docker
\ No newline at end of file
--
GitLab