wip

.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

.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"
 
 

.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"