16029: Moves Dockefile to its own subdir.

[arvados-workbench2.git] / Makefile

diff --git a/Makefile b/Makefile
index 2570063659c29a95dbf3edf2a54897c9d53ceb04..bb09fb2f3476ee3ed23a3c9fa9252f6f8602acbd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ ITERATION?=1
 TARGETS?="centos7 debian8 debian9 debian10 ubuntu1404 ubuntu1604 ubuntu1804"
 
 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/
@@ -60,9 +60,15 @@ 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
 
+integration-tests: yarn-install
+       yarn run cypress install
+       $(WORKSPACE)/tools/run-integration-tests.sh
+
+test: unit-tests integration-tests
+
 build: test
        VERSION=$(VERSION) yarn build