From 6256e7832496cb930bc87970bb3a0c0e3ed1ca3b Mon Sep 17 00:00:00 2001
From: Neil-Jocelyn Schark <neil-jocelyn.schark@stud.h-da.de>
Date: Thu, 24 Jun 2021 17:04:56 +0200
Subject: [PATCH] moved build together
---
build/ci/.build-container.yml | 63 +++++++++++++----------------------
build/ci/.containerlab-ci.yml | 2 +-
2 files changed, 24 insertions(+), 41 deletions(-)
diff --git a/build/ci/.build-container.yml b/build/ci/.build-container.yml
index 6871093d8..b835e8790 100644
--- a/build/ci/.build-container.yml
+++ b/build/ci/.build-container.yml
@@ -1,7 +1,7 @@
variables:
DOCKER_TLS_CERTDIR: "/certs"
-.build: &build
+build-docker:
before_script:
- echo "override global before script"
stage: build
@@ -9,49 +9,32 @@ variables:
needs: []
tags:
- shell-builder
- script:
- - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- - docker build --build-arg GITLAB_USER=$GO_MODULES_USER --build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN --build-arg BUILDARGS=$BUILDARGS -t $DOCKER_IMAGE_SHA .
- - docker push $DOCKER_IMAGE_SHA
- - docker tag $DOCKER_IMAGE_SHA $TAG
- - docker push $TAG
- - docker build --target installer --build-arg GITLAB_USER=$GO_MODULES_USER --build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN --build-arg BUILDARGS=$BUILDARGS -t registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID} .
- - docker push registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID}
-build:develop:
- variables:
- TAG: $CI_REGISTRY_IMAGE:develop
- BUILDARGS: -race
rules:
- if: $CI_COMMIT_BRANCH == "develop" && $CI_NIGHTLY == null
- <<: *build
-
-build:nightly:develop:
- variables:
- TAG: $CI_REGISTRY_IMAGE:nightly-develop
- BUILDARGS: -race
- rules:
+ variables:
+ TAG: $CI_REGISTRY_IMAGE:develop
+ BUILDARGS: -race
- if: $CI_NIGHTLY == "develop"
- <<: *build
-
-build:nightly:
- variables:
- TAG: $CI_REGISTRY_IMAGE:nightly
- rules:
+ variables:
+ TAG: $CI_REGISTRY_IMAGE:nightly-develop
+ BUILDARGS: -race
- if: $CI_NIGHTLY == "mainline"
- <<: *build
-
-build:merge-request:
- variables:
- TAG: $CI_REGISTRY_IMAGE:merge-request
- BUILDARGS: -race
- rules:
+ variables:
+ TAG: $CI_REGISTRY_IMAGE:nightly
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
- <<: *build
-
-build:latest:
- variables:
- TAG: $CI_REGISTRY_IMAGE:latest
- rules:
+ variables:
+ TAG: $CI_REGISTRY_IMAGE:merge-request
+ BUILDARGS: -race
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_NIGHTLY == null
- <<: *build
\ No newline at end of file
+ variables:
+ TAG: $CI_REGISTRY_IMAGE:latest
+
+ script:
+ - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - docker build --build-arg GITLAB_USER=$GO_MODULES_USER --build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN --build-arg BUILDARGS=$BUILDARGS -t $DOCKER_IMAGE_SHA .
+ - docker push $DOCKER_IMAGE_SHA
+ - docker tag $DOCKER_IMAGE_SHA $TAG
+ - docker push $TAG
+ - docker build --target installer --build-arg GITLAB_USER=$GO_MODULES_USER --build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN --build-arg BUILDARGS=$BUILDARGS -t registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID} .
+ - docker push registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID}
\ No newline at end of file
diff --git a/build/ci/.containerlab-ci.yml b/build/ci/.containerlab-ci.yml
index 8eced5f53..f968e0a13 100644
--- a/build/ci/.containerlab-ci.yml
+++ b/build/ci/.containerlab-ci.yml
@@ -53,7 +53,7 @@ containerlab:deploy:
- .containerlab_template
- .containerlab_rules
stage: apply
- needs: ["containerlab:template", "build:merge-request", "build:develop"]
+ needs: ["containerlab:template", "build-docker"]
script:
- sudo containerlab deploy --topo ${CI_PROJECT_DIR}/${CLAB_NAME}.clab.yml --reconfigure
- echo "GOSDN_HTTP_PORT=$(docker inspect -f '{{ (index (index .NetworkSettings.Ports "8080/tcp") 0).HostPort }}' clab-${CLAB_NAME}-gosdn)" >> ${CI_PROJECT_DIR}/build.env
--
GitLab