Merge branch '17018-readonly-file-actions-fix'

[arvados-workbench2.git] / Makefile

diff --git a/Makefile b/Makefile
index 0963b7c9a91474e1efbf4063658a816aad336ed3..64fe9e563f4a26b7534aabc7fd424a0032b29ba2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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,10 +60,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
+
+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 +121,4 @@ copy: $(DEB_FILE) $(RPM_FILE)
 packages: copy
 
 workbench2-build-image:
-       docker build -t workbench2-build .
+       (cd docker && docker build -t workbench2-build .)