Fix gitaly configuration file for Workhorse integration tests

.gitlab/ci/workhorse.gitlab-ci.yml

@@ -17,12 +17,13 @@ workhorse:verify:
   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

workhorse/Makefile

@@ -68,6 +68,7 @@ test: prepare-tests
 	go test -tags "$(BUILD_TAGS)" ./... ;\
 	status="$$?" ;\
 	if [ -f "$(GITALY_PID_FILE)" ] ; then \
+		echo "Clean up Gitaly server for workhorse integration test" ;\
 		kill -9 $$(cat $(GITALY_PID_FILE)) ;\
 		rm $(GITALY_PID_FILE) ;\
 	else \
@@ -105,12 +106,12 @@ $(GITALY_PID_FILE): gitaly.toml
 		echo "To run gitaly integration tests set GITALY_ADDRESS=tcp://127.0.0.1:8075" ; \
 	else \
 		cd .. ; \
-		GITALY_TESTING_NO_GIT_HOOKS=1 GITALY_PID_FILE=$(GITALY_PID_FILE) $(GITALY) workhorse/gitaly.toml ; \
+		GITALY_TESTING_NO_GIT_HOOKS=1 GITALY_PID_FILE=workhorse/$(GITALY_PID_FILE) $(GITALY) workhorse/gitaly.toml ; \
 	fi \
 	} &
 
 gitaly.toml: ../tmp/tests/gitaly/config.toml
-	sed -e 's/^socket_path.*$$/listen_addr = "0.0.0.0:8075"/' \
+	sed -e 's/^socket_path.*$$/listen_addr = "0.0.0.0:8075"/;s/^\[auth\]$$//;s/^token.*$$//;s/^internal_socket_dir.*$$//' \
 		$< > $@
 
 testdata/data/group/test.git: