X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/067e3b08a3b7bf6df181b6b138d7eadca7a63d79..ec9057d4237fb070cb9c707e7131cc8f1cf009ea:/Makefile

diff --git a/Makefile b/Makefile
index 25700636..1e923710 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 debian9 debian10 ubuntu1404 ubuntu1604 ubuntu1804"
+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>"
+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
@@ -33,7 +35,7 @@ RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
 
 export WORKSPACE?=$(shell pwd)
 
-.PHONY: help clean* yarn-install test build packages packages-with-version
+.PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
 
 help:
 	@echo >&2
@@ -60,10 +62,19 @@ clean: clean-rpm clean-deb clean-node-modules
 yarn-install:
 	yarn install
 
-test: yarn-install
+unit-tests: yarn-install
 	yarn test --no-watchAll --bail --ci
 
-build: test
+integration-tests: yarn-install
+	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
+
+test: unit-tests integration-tests
+
+build: yarn-install
 	VERSION=$(VERSION) yarn build
 
 $(DEB_FILE): build
@@ -112,4 +123,4 @@ copy: $(DEB_FILE) $(RPM_FILE)
 packages: copy
 
 workbench2-build-image:
-	docker build -t workbench2-build .
+	(cd docker && docker build -t workbench2-build .)