X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/e59bd2157e1ef8f67a48f2956ee4f03d3490b915..e31bd3f0af6e0b3d4166af144ef8aed5d110b5af:/Makefile

diff --git a/Makefile b/Makefile
index 6da3ed10..aaf2271c 100644
--- a/Makefile
+++ b/Makefile
@@ -17,13 +17,15 @@ VERSION?=$(shell ./version-at-commit.sh HEAD)
 # changes in the package. (i.e. example config files externally added
 ITERATION?=1
 
-TARGETS?="centos7 debian8 debian10 ubuntu1404 ubuntu1604 ubuntu1804 ubuntu2004"
+TARGETS?=centos7 debian10 debian11 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
@@ -57,7 +59,15 @@ clean-node-modules:
 
 clean: clean-rpm clean-deb clean-node-modules
 
-yarn-install:
+arvados-server-install:
+	cd $(ARVADOS_DIRECTORY)
+	go mod download
+	cd cmd/arvados-server
+	go install
+	cd -
+	~/go/bin/arvados-server install -type test
+
+yarn-install: arvados-server-install
 	yarn install
 
 unit-tests: yarn-install
@@ -65,7 +75,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