Skip to content
Snippets Groups Projects
Commit 9e548892 authored by Manuel Kieweg's avatar Manuel Kieweg
Browse files

Merge branch...

Merge branch '132-Prevent-containerlab-destroy-pipeline-step-from-running-if-not-needed' into 'develop'

Resolve "Prevent containerlab:destroy pipeline step from running if not needed"

See merge request cocsn/gosdn!182
parents 8cd9d91e a914933d
No related branches found
No related tags found
9 merge requests!246Develop,!245Develop into Master,!244Master into develop2 into master,!219Draft: Testing,!214Test pipelines,!195DO NOT MERGE 2,!194DO NOT MERGE! just for testing,!182Resolve "Prevent containerlab:destroy pipeline step from running if not needed",!138Develop
Pipeline #80137 passed
......@@ -40,4 +40,4 @@ build-docker:
- docker tag $DOCKER_IMAGE_SHA $TAG
- docker push $TAG
- docker build --target installer --build-arg GITLAB_USER=$GO_MODULES_USER --build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN --build-arg BUILDARGS=$BUILDARGS -t registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID} .
- docker push registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID}
\ No newline at end of file
- docker push registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID}
......@@ -12,4 +12,4 @@ code-quality:
reports:
codequality: gl-code-quality-report.json
paths:
- gl-code-quality-report.json
\ No newline at end of file
- gl-code-quality-report.json
variables:
CEOS_CONTAINER_IMAGE: "$CI_REGISTRY_IMAGE/ceos:latest"
CLAB_INT1_TEMPLATE: "${CI_PROJECT_DIR}/test/containerlab/int01.clab.yml"
......@@ -13,17 +12,6 @@ variables:
- if: $CI_NIGHTLY
.containerlab_template: &containerlab_template
tags:
- shell
before_script:
- cd ${CLAB_DIR}
- echo "$CI_REGISTRY_PASSWORD" | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
- echo $DOCKER_IMAGE_SHA
- docker pull $DOCKER_IMAGE_SHA
- docker pull ${CEOS_CONTAINER_IMAGE}
containerlab:template:
extends: .containerlab_rules
image: alpine:latest
......@@ -50,10 +38,17 @@ containerlab:template:
containerlab:deploy:
extends:
- .containerlab_template
- .containerlab_rules
stage: apply
needs: ["containerlab:template", "build-docker"]
tags:
- shell
before_script:
- cd ${CLAB_DIR}
- echo "$CI_REGISTRY_PASSWORD" | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
- echo $DOCKER_IMAGE_SHA
- docker pull $DOCKER_IMAGE_SHA
- docker pull ${CEOS_CONTAINER_IMAGE}
script:
- sudo containerlab deploy --topo ${CI_PROJECT_DIR}/${CLAB_NAME}.clab.yml --reconfigure
- echo "GOSDN_HTTP_PORT=$(docker inspect -f '{{ (index (index .NetworkSettings.Ports "8080/tcp") 0).HostPort }}' clab-${CLAB_NAME}-gosdn)" >> ${CI_PROJECT_DIR}/build.env
......@@ -66,6 +61,13 @@ containerlab:deploy:
dotenv: ${CI_PROJECT_DIR}/build.env
containerlab:destroy:
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop')
when: always
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: always
- if: $CI_NIGHTLY
when: always
stage: .post
tags:
- shell
......@@ -78,4 +80,3 @@ containerlab:destroy:
allow_failure: true
dependencies:
- containerlab:template
when: always
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment