From fbd20e1a8b94e88ccb47e9b97c2e4c0b3c8373ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Sterba?= <andre.sterba@stud.h-da.de>
Date: Mon, 21 Mar 2022 11:56:24 +0100
Subject: [PATCH] Some CI fixes 2
---
.gitlab-ci.yml | 38 ++++++++++++++++-----------------
.gitlab/ci/.build-container.yml | 3 +--
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb78762ba..7f9bc1738 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,24 +1,24 @@
variables:
- GOSDN_IMAGE: "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}"
- GOSDN_TESTING_IMAGE: "${CI_REGISTRY_IMAGE}:testing_${CI_COMMIT_SHA}"
- CEOS_IMAGE: "$CI_REGISTRY_IMAGE/ceos:latest"
- GOLANG_VERSION: "1.18"
+ GOSDN_IMAGE: "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}"
+ GOSDN_TESTING_IMAGE: "${CI_REGISTRY_IMAGE}:testing_${CI_COMMIT_SHA}"
+ CEOS_IMAGE: "$CI_REGISTRY_IMAGE/ceos:latest"
+ GOLANG_VERSION: "1.18"
stages:
- - build
- - test
- - analyze
- - apply
- - integration-test
- - build-release
- - .post
+ - build
+ - test
+ - analyze
+ - apply
+ - integration-test
+ - build-release
+ - .post
include:
- - local: '/.gitlab/ci/.build-container.yml'
- - local: '/.gitlab/ci/.code-quality-ci.yml'
- - local: '/.gitlab/ci/.security-and-compliance-ci.yml'
- - local: '/.gitlab/ci/.test.yml'
- - local: '/.gitlab/ci/.containerlab-ci.yml'
- - local: '/.gitlab/ci/.integration-test.yml'
- - local: '/.gitlab/ci/.uml-autogen-ci.yml'
- - local: '/.gitlab/ci/.build-release.yml'
+ - local: "/.gitlab/ci/.build-container.yml"
+ - local: "/.gitlab/ci/.code-quality-ci.yml"
+ - local: "/.gitlab/ci/.security-and-compliance-ci.yml"
+ - local: "/.gitlab/ci/.test.yml"
+ - local: "/.gitlab/ci/.containerlab-ci.yml"
+ - local: "/.gitlab/ci/.integration-test.yml"
+ - local: "/.gitlab/ci/.uml-autogen-ci.yml"
+ - local: "/.gitlab/ci/.build-release.yml"
diff --git a/.gitlab/ci/.build-container.yml b/.gitlab/ci/.build-container.yml
index 288ebd91a..648feba53 100644
--- a/.gitlab/ci/.build-container.yml
+++ b/.gitlab/ci/.build-container.yml
@@ -7,6 +7,7 @@
TAG: $CI_COMMIT_BRANCH
before_script:
# replace all slashes in the tag with hyphen, because slashes are not allowed in tags
+ - cd controller/
- TAG=${TAG//\//-}
- mkdir -p /kaniko/.docker
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"},\"$CI_DEPENDENCY_PROXY_SERVER\":{\"username\":\"$CI_DEPENDENCY_PROXY_USER\",\"password\":\"$CI_DEPENDENCY_PROXY_TOKEN\"}}}" > /kaniko/.docker/config.json
@@ -23,7 +24,6 @@ build-testing-image:
BUILDARGS: -race
- when: always
script:
- - cd controller/
- /kaniko/executor
--cache=true
--context "$CI_PROJECT_DIR"
@@ -48,7 +48,6 @@ build-image:
BUILDARGS: -race
- when: always
script:
- - cd controller/
- /kaniko/executor
--cache=true
--context "$CI_PROJECT_DIR"
--
GitLab