Commit 7051e902 authored by Manuel Kieweg's avatar Manuel Kieweg 🤷
Browse files

always run k8s clean up and change wait to CI native wait

parent 611ba682
......@@ -52,10 +52,11 @@ deploy:latest:
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
k8s:destroy:
destroy:k8s:
image: bitnami/kubectl:latest
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
when: always
before_script:
- echo "override global before script"
stage: .post
......
......@@ -64,7 +64,7 @@ apply:
- plan
<<: *tf
tf:destroy:
destroy:tf:
stage: .post
script:
- gitlab-terraform destroy
......
......@@ -9,10 +9,13 @@ integration-test:
GOSDN_TEST_API_ENDPOINT: http://gosdn-$CI_COMMIT_SHA.apps.ocp.fbi.h-da.de/api
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
when: delayed
start_in: 2 minutes
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
allow_failure: true
when: delayed
start_in: 2 minutes
script:
- sleep 2m
- go test -race ./test/integration -v -coverprofile=coverage.out
.test: &test
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment