20688: Make sure ARVADOS_DIRECTORY is set when it is needed

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/Makefile b/Makefile
index 07c3b200ea5258a7aa97fd50634f19a2d7175eeb..0b1b2381efa558a487d5d0ed8e54d0807f491fae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ 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
@@ -77,13 +77,16 @@ 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
+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
 
 build: yarn-install