From f8c7f38d02ebf964cbf40d9445f0f9f843710701 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 8 Sep 2022 15:12:29 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .gitlab/ci/workhorse.gitlab-ci.yml | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to '.gitlab/ci/workhorse.gitlab-ci.yml')

diff --git a/.gitlab/ci/workhorse.gitlab-ci.yml b/.gitlab/ci/workhorse.gitlab-ci.yml
index ade2f65441f..efd37b2247b 100644
--- a/.gitlab/ci/workhorse.gitlab-ci.yml
+++ b/.gitlab/ci/workhorse.gitlab-ci.yml
@@ -9,23 +9,38 @@ workhorse:verify:
 
 .workhorse:test:
   extends: .workhorse:rules:workhorse
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}:git-2.36
   variables:
     GITALY_ADDRESS: "tcp://127.0.0.1:8075"
+    GO_VERSION: "1.17"
   stage: test
   needs:
     - setup-test-env
-  script:
+  before_script:
     - go version
     - apt-get update && apt-get -y install libimage-exiftool-perl
     - scripts/gitaly-test-build
+  script:
     - make -C workhorse test
 
-workhorse:test using go 1.17:
+workhorse:test go:
   extends: .workhorse:test
-  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-golang-1.17-git-2.31
+  parallel:
+    matrix:
+      - GO_VERSION: ["1.17", "1.18"]
+  script:
+    - make -C workhorse test-coverage
+  coverage: '/\d+.\d+%/'
+  artifacts:
+    paths:
+      - workhorse/coverage.html
 
-workhorse:test using go 1.17 with FIPS:
+workhorse:test fips:
   extends: .workhorse:test
   variables:
     WORKHORSE_TEST_FIPS_ENABLED: 1
-  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-golang-1.17-git-2.31
+
+workhorse:test race:
+  extends: .workhorse:test
+  script:
+    - make -C workhorse test-race
-- 
cgit v1.2.3