From 75ca94db2ae1be288dabcfa38d24689f1c71e855 Mon Sep 17 00:00:00 2001
From: Neil-Jocelyn Schark <neil-jocelyn.schark@stud.h-da.de>
Date: Wed, 3 Nov 2021 12:48:36 +0100
Subject: [PATCH] wip
---
.gitlab/ci/.build-container.yml | 9 +++------
.gitlab/ci/.containerlab-ci.yml | 6 +++---
.gitlab/ci/.integration-test.yml | 2 +-
.gitlab/ci/scripts/generate_octet.sh | 0
4 files changed, 7 insertions(+), 10 deletions(-)
mode change 100644 => 100755 .gitlab/ci/scripts/generate_octet.sh
diff --git a/.gitlab/ci/.build-container.yml b/.gitlab/ci/.build-container.yml
index 8d4fb6aff..48c9311f4 100644
--- a/.gitlab/ci/.build-container.yml
+++ b/.gitlab/ci/.build-container.yml
@@ -13,19 +13,16 @@ build-docker:
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule"'
when: never
- - if: '$CI_COMMIT_BRANCH || $CI_PIPELINE_SOURCE == "merge_request_event"'
- variables:
- TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH
- TEST: Fall1
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
variables:
TAG: $CI_REGISTRY_IMAGE:latest
- TEST: Fall2
- if: $CI_COMMIT_BRANCH == "develop"
variables:
TAG: $CI_REGISTRY_IMAGE:develop
- TEST: Fall3
BUILDARGS: -race
+ - if: '$CI_COMMIT_BRANCH'
+ variables:
+ TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH
script:
- echo $TEST
diff --git a/.gitlab/ci/.containerlab-ci.yml b/.gitlab/ci/.containerlab-ci.yml
index 033be26cd..42316d588 100644
--- a/.gitlab/ci/.containerlab-ci.yml
+++ b/.gitlab/ci/.containerlab-ci.yml
@@ -44,7 +44,7 @@ containerlab:template:integration:
variables:
CLAB_TEMPLATE: "${CI_PROJECT_DIR}/test/containerlab/int01.clab.tmpl.yml"
rules:
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ - if: $CI_OPEN_MERGE_REQUESTS
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "develop"
@@ -64,7 +64,7 @@ containerlab:deploy:integration:
reports:
dotenv: ${CI_PROJECT_DIR}/build.env
rules:
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ - if: $CI_OPEN_MERGE_REQUESTS
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "develop"
@@ -80,7 +80,7 @@ containerlab:destroy:
- docker image rm -f ${GOSDN_CONTAINER_IMAGE}
allow_failure: true
rules:
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ - if: $CI_OPEN_MERGE_REQUESTS
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "develop"
diff --git a/.gitlab/ci/.integration-test.yml b/.gitlab/ci/.integration-test.yml
index 1ffd0520a..f1e874c32 100644
--- a/.gitlab/ci/.integration-test.yml
+++ b/.gitlab/ci/.integration-test.yml
@@ -10,7 +10,7 @@
GOSDN_TEST_USER: "admin"
GOSDN_TEST_PASSWORD: "admin"
rules:
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ - if: $CI_OPEN_MERGE_REQUESTS
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "develop"
diff --git a/.gitlab/ci/scripts/generate_octet.sh b/.gitlab/ci/scripts/generate_octet.sh
old mode 100644
new mode 100755
--
GitLab