From af3e5d864eecf3d8495a89dc3cd32d3c808f8ec8 Mon Sep 17 00:00:00 2001
From: Jaime Martinez <jmartinez@gitlab.com>
Date: Tue, 8 Dec 2020 11:54:39 +1100
Subject: DRY test.yml

---
 .gitlab/ci/test.yml | 49 +++++++++++++++++--------------------------------
 Makefile.util.mk    |  2 +-
 2 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml
index 74b162fa..229dd1c3 100644
--- a/.gitlab/ci/test.yml
+++ b/.gitlab/ci/test.yml
@@ -1,37 +1,33 @@
-.tests:
+.tests-common:
   extends: .go-mod-cache
   stage: test
   tags:
     - gitlab-org-docker
   needs: ['download deps']
   script:
-    - echo "Running all tests without daemonizing..."
     - make setup
-    - make test
-    - make junit-report
   artifacts:
-    paths:
-      - bin/gitlab-pages
     reports:
       junit: junit-test-report.xml
 
+.tests-unit:
+  extends: .tests-common
+  script:
+    - echo "Running all tests without daemonizing..."
+    - make test
+    - make junit-report
+
 .tests-acceptance-deamon:
-  extends: .go-mod-cache
-  stage: test
-  tags:
-    - gitlab-org-docker
-  needs: [ 'download deps' ]
+  extends: .tests-common
   script:
     - echo "Running just the acceptance tests daemonized (tmpdir)...."
     - TEST_DAEMONIZE=tmpdir make acceptance
     - echo "Running just the acceptance tests daemonized (inplace)...."
     - TEST_DAEMONIZE=inplace make acceptance
-  artifacts:
-    paths:
-      - bin/gitlab-pages
+    - make junit-report
 
 test:1.13:
-  extends: .tests
+  extends: .tests-unit
   image: golang:1.13
 
 test-acceptance:1.13:
@@ -39,7 +35,7 @@ test-acceptance:1.13:
   image: golang:1.13
 
 test:1.14:
-  extends: .tests
+  extends: .tests-unit
   image: golang:1.14
 
 test-acceptance:1.14:
@@ -47,28 +43,21 @@ test-acceptance:1.14:
   image: golang:1.14
 
 test:1.15:
-  extends: .tests
+  extends: .tests-unit
   image: golang:1.15
 test-acceptance:1.15:
   extends: .tests-acceptance-deamon
   image: golang:1.15
 
 race:
-  extends: .go-mod-cache
-  stage: test
-  needs: ['download deps']
-  tags:
-    - gitlab-org-docker
+  extends: .tests-common
   script:
     - echo "Running race detector"
     - make race
 
 cover:
-  stage: test
-  extends: .go-mod-cache
-  needs: ['download deps']
+  extends: .tests-common
   script:
-    - make setup
     - make generate-mocks
     - make cover
   coverage: '/total:.+\(statements\).+\d+\.\d+/'
@@ -77,9 +66,7 @@ cover:
       - coverage.html
 
 code_quality:
-  stage: test
-  extends: .go-mod-cache
-  needs: ['download deps']
+  extends: .tests-common
   image: golangci/golangci-lint:v1.27.0
   variables:
     REPORT_FILE: gl-code-quality-report.json
@@ -95,8 +82,6 @@ code_quality:
       - ${REPORT_FILE}
 
 check deps:
-  stage: test
-  extends: .go-mod-cache
-  needs: ['download deps']
+  extends: .tests-common
   script:
     - make deps-check
diff --git a/Makefile.util.mk b/Makefile.util.mk
index aa4aa1eb..4f190ea4 100644
--- a/Makefile.util.mk
+++ b/Makefile.util.mk
@@ -17,7 +17,7 @@ race: .GOPATH/.ok gitlab-pages
 	CGO_ENABLED=1 go test -race $(if $V,-v) $(allpackages)
 
 acceptance: .GOPATH/.ok gitlab-pages
-	go test $(if $V,-v) ./test/acceptance
+	go test $(if $V,-v) ./test/acceptance 2>&1 | tee tests.out
 
 bench: .GOPATH/.ok gitlab-pages
 	go test -bench=. -run=^$$ $(allpackages)
-- 
cgit v1.2.3