diff options
| author | Jaime Martinez <jmartinez@gitlab.com> | 2020-12-07 07:55:05 +0300 |
|---|---|---|
| committer | Jaime Martinez <jmartinez@gitlab.com> | 2020-12-07 07:55:05 +0300 |
| commit | 099b4e16ffd124821bed23a05368b1a65b42c896 (patch) | |
| tree | 6f8d0f3d8fb9f639b1d5854e7b507c2e509de2d1 | |
| parent | b5fc83148cd1a1d4d2c8fe05538207a88e2473c4 (diff) | |
Split daemon acceptance tests
| -rw-r--r-- | .gitlab/ci/test.yml | 37 | ||||
| -rw-r--r-- | Makefile.util.mk | 2 |
2 files changed, 25 insertions, 14 deletions
diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml index 6d05051f..d708ebde 100644 --- a/.gitlab/ci/test.yml +++ b/.gitlab/ci/test.yml @@ -8,6 +8,19 @@ - echo "Running all tests without daemonizing..." - make test - make junit-report + artifacts: + paths: + - bin/gitlab-pages + reports: + junit: junit-test-report.xml + +.tests-acceptance-deamon: + extends: .go-mod-cache + stage: test + tags: + - gitlab-org-docker + needs: [ 'download deps' ] + script: - echo "Running just the acceptance tests daemonized (tmpdir)...." - TEST_DAEMONIZE=tmpdir make acceptance - echo "Running just the acceptance tests daemonized (inplace)...." @@ -15,20 +28,29 @@ artifacts: paths: - bin/gitlab-pages - reports: - junit: junit-test-report.xml test:1.13: extends: .tests image: golang:1.13 +test-acceptance:1.13: + extends: .tests-acceptance-deamon + image: golang:1.13 + test:1.14: extends: .tests image: golang:1.14 +test-acceptance:1.14: + extends: .tests-acceptance-deamon + image: golang:1.14 + test:1.15: extends: .tests image: golang:1.15 +test-acceptance:1.15: + extends: .tests-acceptance-deamon + image: golang:1.15 race: extends: .go-mod-cache @@ -77,14 +99,3 @@ check deps: needs: ['download deps'] script: - make deps-check - -## Use https://github.com/jstemmer/go-junit-report to generate a JUnit report format XML file with go -golang: - stage: test - script: - - go get -u github.com/jstemmer/go-junit-report - - go test -v 2>&1 | go-junit-report -set-exit-code > report.xml - artifacts: - when: always - reports: - junit: report.xml diff --git a/Makefile.util.mk b/Makefile.util.mk index 1294b442..aa4aa1eb 100644 --- a/Makefile.util.mk +++ b/Makefile.util.mk @@ -57,5 +57,5 @@ deps-check: .GOPATH/.ok deps-download: .GOPATH/.ok go mod download -junit-report: bin/go-junit-report +junit-report: .GOPATH/.ok bin/go-junit-report cat tests.out | ./bin/go-junit-report -set-exit-code > junit-test-report.xml |