15610: Code cleanup, styiling additions. (WIP)

[arvados-workbench2.git] / Makefile

diff --git a/Makefile b/Makefile
index 8e29db825f4c02dc197c26ac6e265d610bb07644..4a8854c3fbfd479e08e94b4073cbb4bc986c6522 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=Ward Vandewege <wvandewege@veritasgenetics.com>
+MAINTAINER=Arvados Package Maintainers <packaging@arvados.org>
 
 # DEST_DIR will have the build package copied.
 DEST_DIR=/var/www/arvados-workbench2/workbench2/
@@ -33,7 +33,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,11 +60,20 @@ 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
+
+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: test
-       yarn build
+       VERSION=$(VERSION) yarn build
 
 $(DEB_FILE): build
        fpm \
@@ -112,4 +121,4 @@ copy: $(DEB_FILE) $(RPM_FILE)
 packages: copy
 
 workbench2-build-image:
-       docker build -t workbench2-build .
+       (cd docker && docker build -t workbench2-build .)