17119: implement review feedback.

[arvados.git] / Makefile

diff --git a/Makefile b/Makefile
index bb09fb2f3476ee3ed23a3c9fa9252f6f8602acbd..de88cd3548cbc04be68900fa0b5ce8fecbb00c3c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,9 @@ VERSION?=$(shell ./version-at-commit.sh HEAD)
 # changes in the package. (i.e. example config files externally added
 ITERATION?=1
 
-TARGETS?="centos7 debian8 debian9 debian10 ubuntu1404 ubuntu1604 ubuntu1804"
+TARGETS?="centos7 debian8 debian10 ubuntu1404 ubuntu1604 ubuntu1804 ubuntu2004"
+
+ARVADOS_DIRECTORY?=unset
 
 DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
 MAINTAINER=Arvados Package Maintainers <packaging@arvados.org>
@@ -33,7 +35,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
@@ -65,11 +67,14 @@ unit-tests: yarn-install
 
 integration-tests: yarn-install
        yarn run cypress install
-       $(WORKSPACE)/tools/run-integration-tests.sh
+       $(WORKSPACE)/tools/run-integration-tests.sh -a $(ARVADOS_DIRECTORY)
+
+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
+build: yarn-install
        VERSION=$(VERSION) yarn build
 
 $(DEB_FILE): build
@@ -118,4 +123,4 @@ copy: $(DEB_FILE) $(RPM_FILE)
 packages: copy
 
 workbench2-build-image:
-       docker build -t workbench2-build .
+       (cd docker && docker build -t workbench2-build .)