From 7051e902240d06029b8302669e9717ff9b1d847a Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <manuel.kieweg@h-da.de>
Date: Tue, 13 Apr 2021 11:46:06 +0200
Subject: [PATCH] always run k8s clean up and change wait to CI native wait
---
build/ci/.deploy-k8s.yml | 3 ++-
build/ci/.terraform-ci.yml | 2 +-
build/ci/.test.yml | 5 ++++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/build/ci/.deploy-k8s.yml b/build/ci/.deploy-k8s.yml
index 301828a6f..e98649253 100644
--- a/build/ci/.deploy-k8s.yml
+++ b/build/ci/.deploy-k8s.yml
@@ -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
diff --git a/build/ci/.terraform-ci.yml b/build/ci/.terraform-ci.yml
index b46b2e421..a3760e8eb 100644
--- a/build/ci/.terraform-ci.yml
+++ b/build/ci/.terraform-ci.yml
@@ -64,7 +64,7 @@ apply:
- plan
<<: *tf
-tf:destroy:
+destroy:tf:
stage: .post
script:
- gitlab-terraform destroy
diff --git a/build/ci/.test.yml b/build/ci/.test.yml
index 5cc97d25b..3ae62e0cd 100644
--- a/build/ci/.test.yml
+++ b/build/ci/.test.yml
@@ -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
--
GitLab