From a65b7f2a58bebc9798ae6ceb2a2c2a583ffabc81 Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <mail@manuelkieweg.de>
Date: Thu, 11 Mar 2021 14:00:31 +0000
Subject: [PATCH] integration test for mr, develop, and master only
---
build/ci/.terraform-ci.yml | 1 +
build/ci/.test.yml | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/build/ci/.terraform-ci.yml b/build/ci/.terraform-ci.yml
index c2dc2bda1..64a9afccf 100644
--- a/build/ci/.terraform-ci.yml
+++ b/build/ci/.terraform-ci.yml
@@ -28,6 +28,7 @@ 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:
diff --git a/build/ci/.test.yml b/build/ci/.test.yml
index edab2169d..9e8e1fa25 100644
--- a/build/ci/.test.yml
+++ b/build/ci/.test.yml
@@ -11,13 +11,22 @@ integration-test:
after_script:
- go tool cover -func=coverage.out
+unit-test-merge-request:
+ image: golang:1.14
+ stage: test
+ allow_failure: true
+ rules:
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
+ script:
+ - go test -race $(go list ./... | grep -v /forks/ | grep -v /api/ | grep -v /mocks ) -v -coverprofile=coverage.out
+ after_script:
+ - go tool cover -func=coverage.out
unit-test:
image: golang:1.14
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
script:
- go test -short -race $(go list ./... | grep -v /forks/ | grep -v /api/ | grep -v /mocks ) -v -coverprofile=coverage.out
--
GitLab