From d3221895af0e1b85073c8097b422b62cb71111ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Moreno=20i=20Caireta?=
<inigo.moreno@tecnalia.com>
Date: Mon, 15 May 2023 16:05:48 +0200
Subject: [PATCH] Fix issues
---
ci-templates/core.yml | 4 ----
ci-templates/industrial-ci-templates.yml | 3 +++
ci-templates/syntax-check.yml | 3 +++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ci-templates/core.yml b/ci-templates/core.yml
index d565be5..790f9bd 100644
--- a/ci-templates/core.yml
+++ b/ci-templates/core.yml
@@ -15,10 +15,6 @@ stages:
- build
- deploy
-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:
- ci-templates/syntax-check.yml
- ci-templates/industrial-ci-templates.yml
diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
index 5e2f16d..ee6d763 100644
--- a/ci-templates/industrial-ci-templates.yml
+++ b/ci-templates/industrial-ci-templates.yml
@@ -1,5 +1,8 @@
.industrial_ci:
stage: build
+ 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}
services:
- name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
alias: docker
diff --git a/ci-templates/syntax-check.yml b/ci-templates/syntax-check.yml
index 742db94..1d9ee61 100644
--- a/ci-templates/syntax-check.yml
+++ b/ci-templates/syntax-check.yml
@@ -4,6 +4,9 @@
clang_format:
stage: .post
+ services:
+ - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
+ alias: docker
before_script:
- apk add --update bash coreutils tar wget
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
--
GitLab