Merge branch fix-ci with refs/heads/master into refs/merge-requests/136/train

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

build/ci/.terraform-ci.yml

@@ -64,7 +64,7 @@ apply:
     - plan
   <<: *tf
 
-tf:destroy:
+destroy:tf:
   stage: .post
   script:
     - gitlab-terraform destroy

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