From 365e8c6eeee3cd3d4758b27028a9debb82e89a5c Mon Sep 17 00:00:00 2001
From: Jon Azpiazu <jon.azpiazu@tecnalia.com>
Date: Wed, 28 Apr 2021 09:01:54 +0200
Subject: [PATCH] Move image definition to each job
---
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 898460a..4df9121 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -1,5 +1,3 @@
-image: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
-
variables:
TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch
@@ -14,6 +12,7 @@ before_script:
- docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
.industrial_ci:
+ image: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
stage: build
before_script:
- apk add --update bash coreutils tar
@@ -76,6 +75,7 @@ industrial_ci_kinetic_deploy:
- tags
clang_format:
+ image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
stage: postcheck
before_script:
- apk add --update bash coreutils tar wget
@@ -95,6 +95,7 @@ clang_format:
## other options like pylint, but much faster and less strict
##########################################################
python_syntax:
+ image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
before_script:
- apk add --update python2
stage: precheck
@@ -108,6 +109,7 @@ python_syntax:
## Uses https://github.com/koalaman/shellcheck
##########################################################
bash_syntax:
+ image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
before_script:
- apk add --update shellcheck
stage: postcheck
@@ -128,6 +130,7 @@ bash_syntax:
## https://github.com/markdownlint/markdownlint/blob/master/docs/RULES.md
##########################################################
markdown_syntax:
+ image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
stage: postcheck
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
@@ -141,6 +144,7 @@ markdown_syntax:
## Uses https://github.com/cytopia/awesome-ci
##########################################################
file_syntax:
+ image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
stage: postcheck
script:
- RET=0
--
GitLab