Merge branch '16159-logout-request-with-token'

[arvados-workbench2.git] / Makefile

diff --git a/Makefile b/Makefile
index 6da3ed1062b038ece0a901794944f93cb053a6ba..6cf9c29dad2cda5b56d61603d20d87da8124bfef 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,11 +19,13 @@ ITERATION?=1
 
 TARGETS?="centos7 debian8 debian10 ubuntu1404 ubuntu1604 ubuntu1804 ubuntu2004"
 
+ARVADOS_DIRECTORY?=unset
+
 DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
 MAINTAINER=Arvados Package Maintainers <packaging@arvados.org>
 
 # DEST_DIR will have the build package copied.
-DEST_DIR=/var/www/arvados-workbench2/workbench2/
+DEST_DIR=/var/www/$(APP_NAME)/workbench2/
 
 # Debian package file
 DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
@@ -65,7 +67,7 @@ unit-tests: yarn-install
 
 integration-tests: yarn-install
        yarn run cypress install
-       $(WORKSPACE)/tools/run-integration-tests.sh
+       $(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