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

diff --git a/services/workbench2/Makefile b/services/workbench2/Makefile
index 7a733b6ab3..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,9 +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 debian10 debian11 ubuntu1804 ubuntu2004
-
-ARVADOS_DIRECTORY?=unset
+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>
@@ -37,8 +38,11 @@ DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
 # redHat package file
 RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
 
+GOPATH=$(shell go env GOPATH)
 export WORKSPACE?=$(shell pwd)
 
+ARVADOS_DIRECTORY?=$(shell env -C $(WORKSPACE) git rev-parse --show-toplevel)
+
 .PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
 
 help:
@@ -67,7 +71,8 @@ arvados-server-install: check-arvados-directory
 	cd $(ARVADOS_DIRECTORY)
 	go mod download
 	cd cmd/arvados-server
-	go install
+	echo GOPATH is $(GOPATH)
+	GOFLAGS=-buildvcs=false go install
 	cd -
 	ls -l $(GOPATH)/bin/arvados-server
 	$(GOPATH)/bin/arvados-server install -type test
@@ -80,13 +85,42 @@ 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 -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make arvados-server-install integration-tests
+	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 SPECFILE=$(SPECFILE)
 
 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 arvados-server-install unit-tests
+	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 unit-tests
+
+tests-in-docker: workbench2-build-image check-arvados-directory
+	docker run -ti --rm \
+		--env ARVADOS_DIRECTORY=/usr/src/arvados \
+		--env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
+		--env ci="${ci}" \
+		-v $(WORKSPACE):/usr/src/arvados/services/workbench2 \
+		-v$(ARVADOS_DIRECTORY):/usr/src/arvados \
+		-w /usr/src/arvados/services/workbench2 \
+		workbench2-build \
+		make test
 
 test: unit-tests integration-tests
 
@@ -126,16 +160,15 @@ $(RPM_FILE): build
 	etc/arvados/workbench2/workbench2.example.json=/etc/arvados/$(APP_NAME)/workbench2.example.json
 
 copy: $(DEB_FILE) $(RPM_FILE)
-	for target in $(TARGETS) ; do \
-	        mkdir -p packages/$$target
-		if [[ $$target =~ ^centos ]]; then
-			cp -p $(RPM_FILE) packages/$$target ; \
-		else
-			cp -p $(DEB_FILE) packages/$$target ; \
-		fi
-	done
-	rm -f $(RPM_FILE)
-	rm -f $(DEB_FILE)
+	for target in $(TARGETS); do \
+		mkdir -p "packages/$$target" && \
+		case "$$target" in \
+			centos*|rocky*) cp -p "$(RPM_FILE)" "packages/$$target" ;; \
+			debian*|ubuntu*) cp -p "$(DEB_FILE)" "packages/$$target" ;; \
+			*) echo "Unknown copy target $$target"; exit 1 ;; \
+		esac ; \
+	done ; \
+	rm -f "$(DEB_FILE)" "$(RPM_FILE)"
 
 # use FPM to create DEB and RPM
 packages: copy
@@ -145,15 +178,21 @@ check-arvados-directory:
 	@if ! test -d "${ARVADOS_DIRECTORY}"; then echo "the environment variable ARVADOS_DIRECTORY does not point at a directory"; exit 1; fi
 
 packages-in-docker: check-arvados-directory workbench2-build-image
-	docker run --env ci="true" \
+	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}" \
-		-w="/tmp/workbench2" \
-		-t -v ${WORKSPACE}:/tmp/workbench2 \
-		-v ${ARVADOS_DIRECTORY}:/tmp/arvados workbench2-build:latest \
-		make packages
+		--env MAINTAINER="${MAINTAINER}" \
+		--env DESCRIPTION="${DESCRIPTION}" \
+		--env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
+		-w "/tmp/workbench2" \
+		-v ${WORKSPACE}:/tmp/workbench2 \
+		-v ${ARVADOS_DIRECTORY}:/tmp/arvados \
+		workbench2-build:latest \
+		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}