Also update README
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
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
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
packages: copy
workbench2-build-image:
- docker build -t workbench2-build .
+ (cd docker && docker build -t workbench2-build .)
### Start project
<code>yarn start</code>
-### Run tests
+### Run unit tests
<pre>
-yarn install
-yarn test
+make unit-tests
+</pre>
+
+### Run end-to-end tests
+
+<pre>
+make integration-tests
+</pre>
+
+### Run end-to-end tests in a Docker container
+
+<pre>
+make integration-tests-in-docker
</pre>
### Production build
### Package build
<pre>
-docker build -t arvados/fpm .
+make workbench2-build-image
docker run -v$PWD:$PWD -w $PWD arvados/fpm make packages
</pre>
fi
if [ -f "${WB2_DIR}/public/config.json" ]; then
- echo "ERROR: Cannot run with Workbench2's public/config.json file"
+ echo "ERROR: Please move public/config.json file out of the way"
exit 1
fi