wip

.gitlab/ci/.build-container.yml

@@ -13,8 +13,6 @@ build-docker:
     - shell-builder
 
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
-      when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       variables:
         TAG: $CI_REGISTRY_IMAGE:latest
@@ -23,10 +21,13 @@ build-docker:
         TAG: $CI_REGISTRY_IMAGE:develop
         BUILDARGS: -race
     - when: always
+    - variables:
+        TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
  
   script:
    - echo $TAG
    - echo $CI_COMMIT_BRANCH
+   - echo $CI_COMMIT_REF_NAME
    - 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

.gitlab/ci/.containerlab-ci.yml

@@ -43,9 +43,6 @@ containerlab:template:integration:
   extends: .containerlab_template
   variables:
     CLAB_TEMPLATE: "${CI_PROJECT_DIR}/test/containerlab/int01.clab.tmpl.yml"
-  rules:
-    - if: $CI_OPEN_MERGE_REQUESTS
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "develop"
 
 
 containerlab:deploy:integration:
@@ -63,9 +60,6 @@ containerlab:deploy:integration:
   artifacts:
     reports:
       dotenv: ${CI_PROJECT_DIR}/build.env
-  rules:
-    - if: $CI_OPEN_MERGE_REQUESTS
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "develop"
 
 
 containerlab:destroy:
@@ -79,9 +73,6 @@ containerlab:destroy:
     - docker volume rm -f ${CLAB_NAME}-volume
     - docker image rm -f ${GOSDN_CONTAINER_IMAGE}
   allow_failure: true
-  rules:
-    - if: $CI_OPEN_MERGE_REQUESTS
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "develop"
 
 
 #containerlab:template:develop:

.gitlab/ci/.integration-test.yml

@@ -9,9 +9,6 @@
     GOSDN_TEST_ENDPOINT: "141.100.70.178:${CEOS1_PORT}"
     GOSDN_TEST_USER: "admin"
     GOSDN_TEST_PASSWORD: "admin"
-  rules:
-    - if: $CI_OPEN_MERGE_REQUESTS
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "develop"
 
 
 integration-test:nucleus: