21128: collection filters in place Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa...

[arvados.git] / Makefile

diff --git a/Makefile b/Makefile
index 6a174bcf6c4798d94854696bea4aef652b5a2fb7..0220adadc2993fea8a3d16896da79d4fbbb4d026 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,9 @@ integration-tests-in-docker: workbench2-build-image check-arvados-directory
 unit-tests-in-docker: workbench2-build-image check-arvados-directory
        docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make unit-tests
 
+tests-in-docker: workbench2-build-image check-arvados-directory
+       docker run -t -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados -e ci="${ci}" workbench2-build make test
+
 test: unit-tests integration-tests
 
 build: yarn-install
@@ -153,7 +156,7 @@ packages-in-docker: check-arvados-directory workbench2-build-image
                -w="/tmp/workbench2" \
                -t -v ${WORKSPACE}:/tmp/workbench2 \
                -v ${ARVADOS_DIRECTORY}:/tmp/arvados workbench2-build:latest \
-               make packages
+               sh -c 'git config --global --add safe.directory /tmp/workbench2 && make packages'
 
 workbench2-build-image:
        (cd docker && docker build -t workbench2-build .)