summaryrefslogtreecommitdiff
path: root/.gitlab/ci/workhorse.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab/ci/workhorse.gitlab-ci.yml')
-rw-r--r--.gitlab/ci/workhorse.gitlab-ci.yml15
1 files changed, 6 insertions, 9 deletions
diff --git a/.gitlab/ci/workhorse.gitlab-ci.yml b/.gitlab/ci/workhorse.gitlab-ci.yml
index 0da0a334699..47b5d29ab8e 100644
--- a/.gitlab/ci/workhorse.gitlab-ci.yml
+++ b/.gitlab/ci/workhorse.gitlab-ci.yml
@@ -9,24 +9,21 @@ workhorse:verify:
.workhorse:test:
extends: .workhorse:rules:workhorse
- services:
- - name: registry.gitlab.com/gitlab-org/build/cng/gitaly:latest
- # Disable the hooks so we don't have to stub the GitLab API
- command: ["/usr/bin/env", "GITALY_TESTING_NO_GIT_HOOKS=1", "/scripts/process-wrapper"]
- alias: gitaly
variables:
- GITALY_ADDRESS: "tcp://gitaly:8075"
+ GITALY_ADDRESS: "tcp://127.0.0.1:8075"
stage: test
- needs: []
+ needs:
+ - setup-test-env
script:
- go version
- apt-get update && apt-get -y install libimage-exiftool-perl
+ - scripts/gitaly-test-build
- make -C workhorse test
workhorse:test using go 1.16:
extends: .workhorse:test
- image: ${GITLAB_DEPENDENCY_PROXY}golang:1.16
+ image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.16-git-2.31
workhorse:test using go 1.17:
extends: .workhorse:test
- image: ${GITLAB_DEPENDENCY_PROXY}golang:1.17
+ image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.17-git-2.31