diff options
| author | Vladimir Shushlin <vshushlin@gitlab.com> | 2021-03-29 13:51:52 +0300 |
|---|---|---|
| committer | Vladimir Shushlin <vshushlin@gitlab.com> | 2021-03-29 13:51:52 +0300 |
| commit | 32d1c7b4d61cea0c9e097a1b968677205141c244 (patch) | |
| tree | b6811fb4ff03a789904868d68d7f3b3d799dc04a /.gitlab | |
| parent | 08b7c91002fee0efb684028007eca2b456a884eb (diff) | |
| parent | 63488757fe9c8eba78a0abc497f1f368f225d42d (diff) | |
Merge branch 'remove-gopath-from-makefile' into 'master'
Simplify Makefiles
See merge request gitlab-org/gitlab-pages!453
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/test.yml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml index b4f1eefd..d2ff96d9 100644 --- a/.gitlab/ci/test.yml +++ b/.gitlab/ci/test.yml @@ -11,15 +11,13 @@ .tests-unit: extends: .tests-common script: - - echo "Running all tests without daemonizing..." - - make setup - - make test + - echo "Running all unit tests without daemonizing..." + - make test ARGS='-short' - make junit-report .tests-acceptance-deamon: extends: .tests-common script: - - make setup - echo "Running just the acceptance tests daemonized (tmpdir)...." - TEST_DAEMONIZE=tmpdir make acceptance - echo "Running just the acceptance tests daemonized (inplace)...." @@ -45,6 +43,7 @@ test-acceptance:1.14: test:1.15: extends: .tests-unit image: golang:1.15 + test-acceptance:1.15: extends: .tests-acceptance-deamon image: golang:1.15 @@ -60,7 +59,6 @@ race: cover: extends: .tests-common script: - - make setup - make generate-mocks - make cover coverage: '/total:.+\(statements\).+\d+\.\d+/' |