From ce63c287d659d10c7b328a737972a53e503fd64c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Moreno?= <inigo.moreno@tecnalia.com>
Date: Mon, 13 Sep 2021 15:19:40 +0200
Subject: [PATCH] Test default tags
---
ci-templates/core.yml | 3 +++
ci-templates/industrial-ci-templates.yml | 2 --
ci-templates/post-check.yml | 12 ------------
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/ci-templates/core.yml b/ci-templates/core.yml
index b333e00..42589fe 100644
--- a/ci-templates/core.yml
+++ b/ci-templates/core.yml
@@ -26,3 +26,6 @@ include :
- ci-templates/post-check.yml
- ci-templates/industrial-ci-templates.yml
+default:
+ tags:
+ - docker
\ No newline at end of file
diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
index 839f4ee..2758faf 100644
--- a/ci-templates/industrial-ci-templates.yml
+++ b/ci-templates/industrial-ci-templates.yml
@@ -14,8 +14,6 @@
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"
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"
CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
- tags:
- - docker
.industrial_ci_deploy:
diff --git a/ci-templates/post-check.yml b/ci-templates/post-check.yml
index 3124256..ccf1df2 100644
--- a/ci-templates/post-check.yml
+++ b/ci-templates/post-check.yml
@@ -14,8 +14,6 @@ clang_format:
CLANG_FORMAT_CHECK: file
CLANG_FORMAT_VERSION: "3.8"
when: always
- tags:
- - docker
##########################################################
## Simple check for basic Python syntax errors; this is much less thorough than
@@ -27,8 +25,6 @@ python_syntax:
stage: build
script: python -m compileall -q .
when: always
- tags:
- - docker
##########################################################
## Check for errors in bash/sh scripts
@@ -44,8 +40,6 @@ bash_syntax:
- find . -type f -name '*.bash' -exec shellcheck -s bash {} + || RET=1
- exit $RET
when: always
- tags:
- - docker
##########################################################
## Check for errors in markdown files
@@ -58,8 +52,6 @@ markdown_syntax:
stage: .post
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
##########################################################
## Check for various syntax issues in files; currently
@@ -75,8 +67,6 @@ file_syntax:
- 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:
- - docker
##########################################################
## Check for errors in Asciidoctor files
@@ -90,6 +80,4 @@ adoc_syntax:
- apk add --update curl asciidoctor bash
script:
- curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/asciidoctor_syntax_check.bash | bash -s -- .
- tags:
- - docker
when: always
--
GitLab