diff --git a/build/ci/.containerlab-ci.yml b/build/ci/.containerlab-ci.yml index db038c76a60d1f4f5d396f551dd30df08c95aabf..f63ea19982c1e115c72cbf5b4042899251c79262 100644 --- a/build/ci/.containerlab-ci.yml +++ b/build/ci/.containerlab-ci.yml @@ -42,7 +42,7 @@ variables: containerlab:template:integration: extends: .containerlab_template variables: - CLAB_TEMPLATE: "${CI_PROJECT_DIR}/test/containerlab/int01.clab.tmpl.yml" + CLAB_TEMPLATE: "${CI_PROJECT_DIR}/test/containerlab/complex-1.0.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') - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH @@ -53,12 +53,18 @@ containerlab:deploy:integration: extends: .containerlab_deploy needs: ["containerlab:template:integration", "build-docker"] script: + - cat ${CI_PROJECT_DIR}/${CLAB_NAME}.clab.yml - 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)" \ + CEOS1-1_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos1-1)\n\ + CEOS1-2_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos1-2)\n\ + CEOS2-1-1_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos2-1-1)\n\ + CEOS2-1-2_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos2-1-2)\n\ + CEOS2-2-1_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos2-2-1)\n\ + CEOS2-2-2_PORT=$(docker_host_port 6030 clab-${CLAB_NAME}-ceos2-2-2)" \ > ${CI_PROJECT_DIR}/build.env - cat ${CI_PROJECT_DIR}/build.env artifacts: diff --git a/test/containerlab/complex-1.0.clab.yml b/test/containerlab/complex-1.0.clab.tmpl.yml similarity index 72% rename from test/containerlab/complex-1.0.clab.yml rename to test/containerlab/complex-1.0.clab.tmpl.yml index 690f83f6f4d10e7bd0fee47ec212d1258316413a..cdec98b888e1aff0bd56b69cd863f10aa928ef21 100644 --- a/test/containerlab/complex-1.0.clab.yml +++ b/test/containerlab/complex-1.0.clab.tmpl.yml @@ -1,29 +1,48 @@ # topology documentation: http://containerlab.srlinux.dev/lab-examples/srl-ceos/ -name: complex-1.0 +name: @@CLAB_NAME@@ + +mgmt: + network: @@CLAB_NAME@@ + ipv4_subnet: @@CLAB_MGMT_SUBNET@@ topology: nodes: gosdn: kind: linux - image: registry.code.fbi.h-da.de/cocsn/gosdn:develop + image: @@GOSDN_CONTAINER_IMAGE@@ + ports: + - 0:8080 + - 0:55055 ceos1-1: kind: ceos - image: ceosimage:4.26.0F + image: @@CEOS_CONTAINER_IMAGE@@ + ports: + - 0:6030 ceos1-2: kind: ceos - image: ceosimage:4.26.0F + image: @@CEOS_CONTAINER_IMAGE@@ + ports: + - 0:6030 ceos2-1-1: kind: ceos - image: ceosimage:4.26.0F + image: @@CEOS_CONTAINER_IMAGE@@ + ports: + - 0:6030 ceos2-1-2: kind: ceos - image: ceosimage:4.26.0F + image: @@CEOS_CONTAINER_IMAGE@@ + ports: + - 0:6030 ceos2-2-1: kind: ceos - image: ceosimage:4.26.0F + image: @@CEOS_CONTAINER_IMAGE@@ + ports: + - 0:6030 ceos2-2-2: kind: ceos - image: ceosimage:4.26.0F + image: @@CEOS_CONTAINER_IMAGE@@ + ports: + - 0:6030 server3-1-1: kind: linux image: alpine:latest @@ -39,7 +58,7 @@ topology: server3-2-2: kind: linux image: alpine:latest - + links: - endpoints: ["ceos1-1:eth1", "ceos2-1-1:eth1"]