X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6796b44d4934ddff098e1bfcf7b842ec11e4e210..5c43d687670c99b960c4fe113bc77690fc348614:/Makefile

diff --git a/Makefile b/Makefile
index 2ca5e79a18..bbdd4b37ed 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
 # redHat package file
 RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
 
+GOPATH=$(shell go env GOPATH)
 export WORKSPACE?=$(shell pwd)
 
 .PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
@@ -66,10 +67,11 @@ arvados-server-install: check-arvados-directory
 	cd $(ARVADOS_DIRECTORY)
 	go mod download
 	cd cmd/arvados-server
-	go install
+	echo GOPATH is $(GOPATH)
+	GOFLAGS=-buildvcs=false go install
 	cd -
-	ls -l ~/go/bin/arvados-server
-	~/go/bin/arvados-server install -type test
+	ls -l $(GOPATH)/bin/arvados-server
+	$(GOPATH)/bin/arvados-server install -type test
 
 yarn-install: arvados-server-install
 	yarn install
@@ -87,6 +89,9 @@ integration-tests-in-docker: workbench2-build-image check-arvados-directory
 unit-tests-in-docker: workbench2-build-image check-arvados-directory
 	docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make unit-tests
 
+tests-in-docker: workbench2-build-image check-arvados-directory
+	docker run -t -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados -e ci="${ci}" workbench2-build make test
+
 test: unit-tests integration-tests
 
 build: yarn-install