Resolve "Deploy develop to Containerlab"

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.

Closes #133 (closed)

build/ci/.containerlab-ci.yml

@@ -2,6 +2,7 @@ variables:
   CEOS_CONTAINER_IMAGE: "$CI_REGISTRY_IMAGE/ceos:latest"
   GOSDN_CONTAINER_IMAGE: "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}"
   CLAB_DIR: "/mnt"
+  CLAB_NAME: "clab${CI_PIPELINE_IID}"
 
 # Templates for Job Types
 .containerlab_deploy: &containerlab_deploy
@@ -41,7 +42,6 @@ variables:
 containerlab:template:integration:
   extends: .containerlab_template
   variables:
-    CLAB_NAME: "clab${CI_PIPELINE_IID}"
     CLAB_TEMPLATE: "${CI_PROJECT_DIR}/test/containerlab/int01.clab.tmpl.yml"
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop')
@@ -52,16 +52,14 @@ containerlab:template:integration:
 containerlab:deploy:integration:
   extends: .containerlab_deploy
   needs: ["containerlab:template:integration", "build-docker"]
-  variables:
-    CLAB_NAME: "clab${CI_PIPELINE_IID}"
   script:
     - sudo containerlab deploy --topo ${CI_PROJECT_DIR}/${CLAB_NAME}.clab.yml --reconfigure
     - |
       echo -e "\
       GOSDN_HTTP_PORT=$(docker_host_port 8080 clab-${CLAB_NAME}-gosdn)\n\
       GOSDN_GRPC_PORT=$(docker_host_port 55055 clab-${CLAB_NAME}-gosdn)\n\
-      CEOS1_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos1)\n" \
-      >> ${CI_PROJECT_DIR}/build.env
+      CEOS1_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos1)" \
+      > ${CI_PROJECT_DIR}/build.env
     - cat ${CI_PROJECT_DIR}/build.env
   artifacts:
     reports:
@@ -99,7 +97,7 @@ containerlab:template:develop:
     CLAB_TEMPLATE: "${CI_PROJECT_DIR}/test/containerlab/dev.clab.tmpl.yml"
     GOSDN_CONTAINER_IMAGE: "$CI_REGISTRY_IMAGE:develop"
   rules:
-    - if: $CI_COMMIT_BRANCH == 'develop'
+    - if: $CI_COMMIT_BRANCH == 'develop' && $CI_NIGHTLY == null
 
 
 containerlab:deploy:develop:
@@ -112,7 +110,7 @@ containerlab:deploy:develop:
   script:
     - sudo containerlab deploy --topo ${CI_PROJECT_DIR}/${CLAB_NAME}.clab.yml --reconfigure
   rules:
-    - if: $CI_COMMIT_BRANCH == 'develop'
+    - if: $CI_COMMIT_BRANCH == 'develop' && $CI_NIGHTLY == null
 
 
 containerlab:clean: