X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ac317fdfc6cc1bfdee257580a03a6054edac05a2..8dbd060cdc504973ca88a8bf806dc7eb3f8df31b:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 2236f9de4f..0b1b2381ef 100644
--- a/Makefile
+++ b/Makefile
@@ -62,12 +62,13 @@ clean-node-modules:
 
 clean: clean-rpm clean-deb clean-node-modules
 
-arvados-server-install:
+arvados-server-install: check-arvados-directory
 	cd $(ARVADOS_DIRECTORY)
 	go mod download
 	cd cmd/arvados-server
 	go install
 	cd -
+	ls -l ~/go/bin/arvados-server
 	~/go/bin/arvados-server install -type test
 
 yarn-install: arvados-server-install
@@ -76,12 +77,15 @@ yarn-install: arvados-server-install
 unit-tests: yarn-install
 	yarn test --no-watchAll --bail --ci
 
-integration-tests: yarn-install
+integration-tests: yarn-install check-arvados-directory
 	yarn run cypress install
 	$(WORKSPACE)/tools/run-integration-tests.sh -a $(ARVADOS_DIRECTORY)
 
-integration-tests-in-docker: workbench2-build-image
-	docker run -ti -v$(PWD):$(PWD) -w$(PWD) workbench2-build make integration-tests
+integration-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 integration-tests
+
+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
 
 test: unit-tests integration-tests