From 853928c6aedba202865986446c3e4948931665a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moreno=20i=20Caireta=2C=20I=C3=B1igo?=
<inigo.moreno@tecnalia.com>
Date: Wed, 22 Sep 2021 10:26:31 +0200
Subject: [PATCH] Resolve "yaml lint Job Failed #317539"
---
.gitlab-industrial-ci-kinetic-no-rosinstall.yml | 2 +-
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 2 +-
ci-templates/auto-rules/kinetic-default.yml | 4 ++--
ci-templates/auto-rules/melodic-default.yml | 4 ++--
ci-templates/auto-rules/no-default.yml | 3 +--
ci-templates/auto-rules/noetic-default.yml | 4 ++--
ci-templates/auto-rules/with-rosinstall/kinetic-default.yml | 4 ++--
ci-templates/auto-rules/with-rosinstall/melodic-default.yml | 4 ++--
ci-templates/auto-rules/with-rosinstall/no-default.yml | 4 ++--
ci-templates/auto-rules/with-rosinstall/noetic-default.yml | 4 ++--
ci-templates/core.yml | 5 ++---
ci-templates/examples/manual_job.yml | 2 +-
ci-templates/examples/simple_include.yml | 2 +-
ci-templates/industrial-ci-templates.yml | 1 -
14 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 0e7c125..d6c6c03 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -1,3 +1,3 @@
include:
- project: tecnalia_robotics-public/gitlab_templates
- file: ci-templates/auto-rules/kinetic-default.yml
\ No newline at end of file
+ file: ci-templates/auto-rules/kinetic-default.yml
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 2413c17..3cd28f6 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -1,3 +1,3 @@
include:
- project: tecnalia_robotics-public/gitlab_templates
- file: ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
\ No newline at end of file
+ file: ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
diff --git a/ci-templates/auto-rules/kinetic-default.yml b/ci-templates/auto-rules/kinetic-default.yml
index 7bc72b9..85b181a 100644
--- a/ci-templates/auto-rules/kinetic-default.yml
+++ b/ci-templates/auto-rules/kinetic-default.yml
@@ -1,4 +1,4 @@
-include : ci-templates/auto-rules/no-default.yml
+include: ci-templates/auto-rules/no-default.yml
variables:
- DEFAULT_DISTRO: kinetic
\ No newline at end of file
+ DEFAULT_DISTRO: kinetic
diff --git a/ci-templates/auto-rules/melodic-default.yml b/ci-templates/auto-rules/melodic-default.yml
index 62379b9..cd5577f 100644
--- a/ci-templates/auto-rules/melodic-default.yml
+++ b/ci-templates/auto-rules/melodic-default.yml
@@ -1,4 +1,4 @@
-include : ci-templates/auto-rules/no-default.yml
+include: ci-templates/auto-rules/no-default.yml
variables:
- DEFAULT_DISTRO: melodic
\ No newline at end of file
+ DEFAULT_DISTRO: melodic
diff --git a/ci-templates/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml
index a2f6a98..7db60c8 100644
--- a/ci-templates/auto-rules/no-default.yml
+++ b/ci-templates/auto-rules/no-default.yml
@@ -1,4 +1,4 @@
-include : ci-templates/core.yml
+include: ci-templates/core.yml
workflow:
rules:
@@ -60,7 +60,6 @@ industrial_ci_noetic:
- if: $BUILD_NOETIC
-
industrial_kinetic_deploy:
extends:
- industrial_ci_kinetic
diff --git a/ci-templates/auto-rules/noetic-default.yml b/ci-templates/auto-rules/noetic-default.yml
index f35658b..3674260 100644
--- a/ci-templates/auto-rules/noetic-default.yml
+++ b/ci-templates/auto-rules/noetic-default.yml
@@ -1,4 +1,4 @@
-include : ci-templates/auto-rules/no-default.yml
+include: ci-templates/auto-rules/no-default.yml
variables:
- DEFAULT_DISTRO: noetic
\ No newline at end of file
+ DEFAULT_DISTRO: noetic
diff --git a/ci-templates/auto-rules/with-rosinstall/kinetic-default.yml b/ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
index fe99b53..d9b2e2d 100644
--- a/ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
+++ b/ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
@@ -1,4 +1,4 @@
-include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+include: ci-templates/auto-rules/with-rosinstall/no-default.yml
variables:
- DEFAULT_DISTRO: kinetic
\ No newline at end of file
+ DEFAULT_DISTRO: kinetic
diff --git a/ci-templates/auto-rules/with-rosinstall/melodic-default.yml b/ci-templates/auto-rules/with-rosinstall/melodic-default.yml
index 47e501b..d3946e7 100644
--- a/ci-templates/auto-rules/with-rosinstall/melodic-default.yml
+++ b/ci-templates/auto-rules/with-rosinstall/melodic-default.yml
@@ -1,4 +1,4 @@
-include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+include: ci-templates/auto-rules/with-rosinstall/no-default.yml
variables:
- DEFAULT_DISTRO: melodic
\ No newline at end of file
+ DEFAULT_DISTRO: melodic
diff --git a/ci-templates/auto-rules/with-rosinstall/no-default.yml b/ci-templates/auto-rules/with-rosinstall/no-default.yml
index f4735f5..5ffe30c 100644
--- a/ci-templates/auto-rules/with-rosinstall/no-default.yml
+++ b/ci-templates/auto-rules/with-rosinstall/no-default.yml
@@ -1,6 +1,6 @@
-include : ci-templates/auto-rules/no-default.yml
+include: ci-templates/auto-rules/no-default.yml
.industrial_ci:
variables:
- UPSTREAM_WORKSPACE: .rosinstall
\ No newline at end of file
+ UPSTREAM_WORKSPACE: .rosinstall
diff --git a/ci-templates/auto-rules/with-rosinstall/noetic-default.yml b/ci-templates/auto-rules/with-rosinstall/noetic-default.yml
index 0d83acd..728ebde 100644
--- a/ci-templates/auto-rules/with-rosinstall/noetic-default.yml
+++ b/ci-templates/auto-rules/with-rosinstall/noetic-default.yml
@@ -1,4 +1,4 @@
-include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+include: ci-templates/auto-rules/with-rosinstall/no-default.yml
variables:
- DEFAULT_DISTRO: noetic
\ No newline at end of file
+ DEFAULT_DISTRO: noetic
diff --git a/ci-templates/core.yml b/ci-templates/core.yml
index 859514f..3553a10 100644
--- a/ci-templates/core.yml
+++ b/ci-templates/core.yml
@@ -1,4 +1,3 @@
-
image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
@@ -22,10 +21,10 @@ 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 :
+include:
- ci-templates/syntax-check.yml
- ci-templates/industrial-ci-templates.yml
default:
tags:
- - docker
\ No newline at end of file
+ - docker
diff --git a/ci-templates/examples/manual_job.yml b/ci-templates/examples/manual_job.yml
index 8cf4e1d..7a4fa8f 100644
--- a/ci-templates/examples/manual_job.yml
+++ b/ci-templates/examples/manual_job.yml
@@ -6,4 +6,4 @@ industrial_ci_kinetic:
extends: .industrial-ci
variables:
ROS_DISTRO: kinetic
- UPSTREAM_WORKSPACE: .rosinstall
\ No newline at end of file
+ UPSTREAM_WORKSPACE: .rosinstall
diff --git a/ci-templates/examples/simple_include.yml b/ci-templates/examples/simple_include.yml
index 3b1a85d..bd726f7 100644
--- a/ci-templates/examples/simple_include.yml
+++ b/ci-templates/examples/simple_include.yml
@@ -1,3 +1,3 @@
include:
- project: tecnalia_robotics-public/gitlab_templates
- file: ci-templates/core.yml
\ No newline at end of file
+ file: ci-templates/core.yml
diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
index 9f2516f..b1c5d84 100644
--- a/ci-templates/industrial-ci-templates.yml
+++ b/ci-templates/industrial-ci-templates.yml
@@ -1,4 +1,3 @@
-
.industrial_ci:
stage: build
before_script:
--
GitLab