From 25c86cfb83309ffb66de613cf1975302f8a678ad Mon Sep 17 00:00:00 2001
From: Neil-Jocelyn Schark <neil-jocelyn.schark@stud.h-da.de>
Date: Thu, 28 Apr 2022 15:09:06 +0000
Subject: [PATCH] Fix develop integration tests
See merge request danet/gosdn!297
---
.gitlab/ci/.build-container.yml | 27 +++++----------------------
1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/.gitlab/ci/.build-container.yml b/.gitlab/ci/.build-container.yml
index b29f906ea..a2a782b8b 100644
--- a/.gitlab/ci/.build-container.yml
+++ b/.gitlab/ci/.build-container.yml
@@ -4,21 +4,9 @@
- shell-builder
variables:
TAG: $CI_COMMIT_SHA
- before_script:
- # replace all slashes in the tag with hyphen, because slashes are not allowed in tags
- - TAG=${TAG//\//-}
needs: []
build-testing-image:
- rules:
- - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- variables:
- TAG: latest
- - if: $CI_COMMIT_BRANCH == "develop"
- variables:
- TAG: $CI_COMMIT_BRANCH
- BUILDARGS: -race
- - when: always
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build -t "$GOSDN_TESTING_IMAGE" -f "${CI_PROJECT_DIR}/controller/Dockerfile" --target "installer" --build-arg "GOLANG_VERSION=$GOLANG_VERSION" --build-arg "BUILDARGS=$BUILDARGS" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" .
@@ -26,17 +14,12 @@ build-testing-image:
<<: *build
build-image:
- rules:
- - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- variables:
- TAG: $CI_DEFAULT_BRANCH
- - if: $CI_COMMIT_BRANCH == "develop"
- variables:
- TAG: develop
- BUILDARGS: -race
- - when: always
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- - docker build -t "$CI_REGISTRY_IMAGE:$TAG" -f "${CI_PROJECT_DIR}/controller/Dockerfile" --target "installer" --build-arg "GOLANG_VERSION=$GOLANG_VERSION" --build-arg "BUILDARGS=$BUILDARGS" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" .
+ - docker build -t "$CI_REGISTRY_IMAGE:$TAG" -f "${CI_PROJECT_DIR}/controller/Dockerfile" --build-arg "GOLANG_VERSION=$GOLANG_VERSION" --build-arg "BUILDARGS=$BUILDARGS" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" .
- docker push "$CI_REGISTRY_IMAGE:$TAG"
+ # replace all slashes in the tag with hyphen, because slashes are not allowed in tags
+ - NEWTAG=${CI_COMMIT_BRANCH//\//-}
+ - docker tag "$CI_REGISTRY_IMAGE:$TAG" "$CI_REGISTRY_IMAGE:$NEWTAG"
+ - docker push "$CI_REGISTRY_IMAGE:$NEWTAG"
<<: *build
--
GitLab