Merge branch '21383-salt-debian12'

[arvados.git] / services / workbench2 / Makefile

diff --git a/services/workbench2/Makefile b/services/workbench2/Makefile
index 0d402a63c14465417727843f9239d395c3a8787b..72235b96f7eb38ce827b0162a989d01b78043742 100644 (file)
--- 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>
@@ -40,6 +43,12 @@ export WORKSPACE?=$(shell pwd)
 
 ARVADOS_DIRECTORY?=$(shell env -C $(WORKSPACE) git rev-parse --show-toplevel)
 
+ifndef ci
+       TI=-ti
+else
+       TI=
+endif
+
 .PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
 
 help:
@@ -82,20 +91,24 @@ 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 \
+       docker run $(TI) --rm \
                --env ARVADOS_DIRECTORY=/usr/src/arvados \
                --env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
                -v $(WORKSPACE):/usr/src/arvados/services/workbench2 \
                -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 \
+       docker run $(TI) --rm \
                --env ARVADOS_DIRECTORY=/usr/src/arvados \
                --env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
                -v $(WORKSPACE):/usr/src/arvados/services/workbench2 \
@@ -105,7 +118,7 @@ unit-tests-in-docker: workbench2-build-image check-arvados-directory
                make arvados-server-install unit-tests
 
 tests-in-docker: workbench2-build-image check-arvados-directory
-       docker run -ti --rm \
+       docker run $(TI) --rm \
                --env ARVADOS_DIRECTORY=/usr/src/arvados \
                --env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
                --env ci="${ci}" \
@@ -187,4 +200,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}