From 66b61c7d72a8926ce95f4154c90f1353d009b058 Mon Sep 17 00:00:00 2001 From: Jon Azpiazu Date: Mon, 21 Dec 2020 14:39:01 +0100 Subject: [PATCH 1/5] Set artifactory registry as proxy to pull jobs' images --- .gitlab-industrial-ci-kinetic-no-rosinstall.yml | 10 +++++----- .gitlab-industrial-ci-kinetic-with-rosinstall.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index 00f5bd2..d54b1c8 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -1,4 +1,4 @@ -image: docker:git +image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git variables: TMPDIR: /builds/${CI_PROJECT_NAMESPACE} @@ -128,7 +128,7 @@ bash_syntax: ########################################################## markdown_syntax: stage: postcheck - script: docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014" + script: docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014" when: always tags: - docker @@ -143,8 +143,8 @@ file_syntax: stage: postcheck script: - RET=0 - - docker run -v ${PWD}:/ac cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1 - - docker run -v ${PWD}:/ac cytopia/awesome-ci file-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1 + - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1 + - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1 - exit $RET when: always tags: @@ -157,7 +157,7 @@ file_syntax: ########################################################## adoc_syntax: stage: postcheck - image: alpine + image: tecnalia-docker-dev.artifact.tecnalia.com/alpine before_script: - apk add --update curl asciidoctor bash script: diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml index c22f303..0574691 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -1,4 +1,4 @@ -image: docker:git +image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git variables: TMPDIR: /builds/${CI_PROJECT_NAMESPACE} @@ -130,7 +130,7 @@ bash_syntax: ########################################################## markdown_syntax: stage: postcheck - script: docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014" + script: docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014" when: always tags: - docker @@ -145,8 +145,8 @@ file_syntax: stage: postcheck script: - RET=0 - - docker run -v ${PWD}:/ac cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1 - - docker run -v ${PWD}:/ac cytopia/awesome-ci file-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1 + - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1 + - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1 - exit $RET when: always tags: @@ -159,7 +159,7 @@ file_syntax: ########################################################## adoc_syntax: stage: postcheck - image: alpine + image: tecnalia-docker-dev.artifact.tecnalia.com/alpine before_script: - apk add --update curl asciidoctor bash script: -- GitLab From bddd0b2de04c78b2063da7bd2457f839d05b2c99 Mon Sep 17 00:00:00 2001 From: Jon Azpiazu Date: Wed, 23 Dec 2020 22:11:57 +0100 Subject: [PATCH 2/5] Changes in registry and login --- .gitlab-industrial-ci-kinetic-with-rosinstall.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml index 0574691..1e662ea 100644 --- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml @@ -1,4 +1,4 @@ -image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git +image: docker:git variables: TMPDIR: /builds/${CI_PROJECT_NAMESPACE} @@ -14,6 +14,7 @@ stages: 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 @@ -21,6 +22,7 @@ before_script: - apk add --update bash coreutils tar - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy - 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 @@ -159,7 +161,7 @@ file_syntax: ########################################################## adoc_syntax: stage: postcheck - image: tecnalia-docker-dev.artifact.tecnalia.com/alpine + image: alpine before_script: - apk add --update curl asciidoctor bash script: -- GitLab From 12ef275feded664743d00285d0e51e97ac7f6a7a Mon Sep 17 00:00:00 2001 From: Jon Azpiazu Date: Thu, 7 Jan 2021 12:48:01 +0100 Subject: [PATCH 3/5] Revert explicit docker registry address --- .gitlab-industrial-ci-kinetic-no-rosinstall.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index d54b1c8..757c2d3 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -1,4 +1,4 @@ -image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git +image: docker:git variables: TMPDIR: /builds/${CI_PROJECT_NAMESPACE} @@ -157,7 +157,7 @@ file_syntax: ########################################################## adoc_syntax: stage: postcheck - image: tecnalia-docker-dev.artifact.tecnalia.com/alpine + image: alpine before_script: - apk add --update curl asciidoctor bash script: -- GitLab From 58ba3c955498178a19bd2cbfb91dec7fbf201c5c Mon Sep 17 00:00:00 2001 From: Jon Azpiazu Date: Thu, 7 Jan 2021 12:53:04 +0100 Subject: [PATCH 4/5] Add login into artifactory registry from non-rosinstall template --- .gitlab-industrial-ci-kinetic-no-rosinstall.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml index 757c2d3..24fc6d1 100644 --- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml +++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml @@ -14,6 +14,7 @@ stages: 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 @@ -21,6 +22,7 @@ before_script: - apk add --update bash coreutils tar - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy - 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 -- GitLab From 5e88ed016e413fae97385a134130a25aa432a284 Mon Sep 17 00:00:00 2001 From: Jon Azpiazu Date: Thu, 7 Jan 2021 14:25:58 +0100 Subject: [PATCH 5/5] Add tag to job - collaterally fix yaml syntax --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26831d3..8ab0b3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,5 +32,7 @@ deploy_devcontainer: - tar cvfz dot_devcontainer.tar.gz -C vscode_devcontainer .devcontainer/ artifacts: paths: - - dot_devcontainer.tar.gz + - dot_devcontainer.tar.gz expire_in: 1 year + tags: + - docker -- GitLab