scricter testing

build/ci/.terraform-ci.yml

@@ -28,7 +28,6 @@ cache:
       variables:
         TF_VAR_container_tag: $CI_REGISTRY_IMAGE:mr-develop
     - if: $CI_COMMIT_BRANCH == "integration-test"
-    - if: $CI_COMMIT_BRANCH == "develop"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
 init:

build/ci/.test.yml

@@ -11,7 +11,7 @@ integration-test:
   after_script:
     - go tool cover -func=coverage.out
 
-unit-test-merge-request:
+integration-test-merge-request:
   image: golang:1.14
   stage: integration-test
   allow_failure: true
@@ -27,7 +27,10 @@ unit-test:
   stage: test
   allow_failure: true
   rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
     - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
+      allow_failure: true
   script:
     - go test -short -race $(go list ./... | grep -v /forks/ | grep -v /api/ | grep -v /mocks ) -v -coverprofile=coverage.out
   after_script: