projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16927: Remove clusterConfigJSON local variable
[arvados-workbench2.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index bb09fb2f3476ee3ed23a3c9fa9252f6f8602acbd..4a8854c3fbfd479e08e94b4073cbb4bc986c6522 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-33,7
+33,7
@@
RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
export WORKSPACE?=$(shell pwd)
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
help:
@echo >&2
@@
-67,6
+67,9
@@
integration-tests: yarn-install
yarn run cypress install
$(WORKSPACE)/tools/run-integration-tests.sh
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
test: unit-tests integration-tests
build: test
@@
-118,4
+121,4
@@
copy: $(DEB_FILE) $(RPM_FILE)
packages: copy
workbench2-build-image:
packages: copy
workbench2-build-image:
- docker build -t workbench2-build .
+ (cd docker && docker build -t workbench2-build .)