diff --git a/.gitlab/ci/.build-container.yml b/.gitlab/ci/.build-container.yml index 8d4fb6afff1f9f9ba5c755bf9d1bcbe5436e1fd2..48c9311f4bd0f2a9ed601ab9d9476d35aaa8d82d 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 033be26cdfc2d1987cb110edbb744b48cb026215..42316d588101d8cc740b7bb9f12686a1dc2e996d 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 1ffd0520af4bad615ffc5df507c0fb649579bb36..f1e874c32caf1f4839ec6d3ee8c801764e63ce3b 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