X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/282562ff358c549980a48ccca41944039f86483a..9d8b1517ec34774e041eede98c050f6bdd184c22:/services/workbench2/Makefile

diff --git a/services/workbench2/Makefile b/services/workbench2/Makefile
index 7e70f3ec9d..1a68d6fd77 100644
--- a/services/workbench2/Makefile
+++ b/services/workbench2/Makefile
@@ -9,6 +9,9 @@ SHELL := /bin/bash
 GOPATH?=~/go
 APP_NAME?=arvados-workbench2
 
+# Cypress test file that can be passed to the integration-test target
+SPECFILE?=ALL
+
 # VERSION uses all the above to produce X.Y.Z.timestamp
 # something in the lines of 1.2.0.20180612145021, this will be the package version
 # it can be overwritten when invoking make as in make packages VERSION=1.2.0
@@ -21,7 +24,7 @@ GIT_COMMIT?=$(shell git rev-parse --short HEAD)
 # changes in the package. (i.e. example config files externally added
 ITERATION?=1
 
-TARGETS?=centos7 rocky8 debian10 debian11 ubuntu1804 ubuntu2004
+TARGETS?=rocky8 debian11 debian12 ubuntu2004 ubuntu2204
 
 DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
 MAINTAINER=Arvados Package Maintainers <packaging@arvados.org>
@@ -82,7 +85,11 @@ unit-tests: yarn-install
 
 integration-tests: yarn-install check-arvados-directory
 	yarn run cypress install
+ifeq ($(SPECFILE), ALL)
 	$(WORKSPACE)/tools/run-integration-tests.sh -a $(ARVADOS_DIRECTORY)
+else
+	$(WORKSPACE)/tools/run-integration-tests.sh -a $(ARVADOS_DIRECTORY) -- --spec $(SPECFILE)
+endif
 
 integration-tests-in-docker: workbench2-build-image check-arvados-directory
 	docker run -ti --rm \
@@ -92,7 +99,7 @@ integration-tests-in-docker: workbench2-build-image check-arvados-directory
 		-v $(ARVADOS_DIRECTORY):/usr/src/arvados \
 		-w /usr/src/arvados/services/workbench2 \
 		workbench2-build \
-		make arvados-server-install integration-tests
+		make arvados-server-install integration-tests SPECFILE=$(SPECFILE)
 
 unit-tests-in-docker: workbench2-build-image check-arvados-directory
 	docker run -ti --rm \
@@ -174,8 +181,11 @@ packages-in-docker: check-arvados-directory workbench2-build-image
 	docker run -t --rm --env ci="true" \
 		--env ARVADOS_DIRECTORY=/tmp/arvados \
 		--env APP_NAME=${APP_NAME} \
+		--env VERSION="${VERSION}" \
 		--env ITERATION=${ITERATION} \
 		--env TARGETS="${TARGETS}" \
+		--env MAINTAINER="${MAINTAINER}" \
+		--env DESCRIPTION="${DESCRIPTION}" \
 		--env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
 		-w "/tmp/workbench2" \
 		-v ${WORKSPACE}:/tmp/workbench2 \
@@ -184,4 +194,5 @@ packages-in-docker: check-arvados-directory workbench2-build-image
 		sh -c 'git config --global --add safe.directory /tmp/workbench2 && make packages'
 
 workbench2-build-image:
-	(cd docker && docker build -t workbench2-build .)
+	docker inspect workbench2-build &> /dev/null || \
+		docker build -t workbench2-build -f docker/Dockerfile ${ARVADOS_DIRECTORY}