Merge branch '21304-user-update' refs #21304

[arvados.git] / services / workbench2 / Makefile

diff --git a/services/workbench2/Makefile b/services/workbench2/Makefile
index 0b1b2381efa558a487d5d0ed8e54d0807f491fae..0d402a63c14465417727843f9239d395c3a8787b 100644 (file)
--- a/services/workbench2/Makefile
+++ b/services/workbench2/Makefile
@@ -6,6 +6,7 @@
 SHELL := /bin/bash
 .ONESHELL:
 
+GOPATH?=~/go
 APP_NAME?=arvados-workbench2
 
 # VERSION uses all the above to produce X.Y.Z.timestamp
@@ -20,9 +21,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?=centos7 rocky8 debian10 debian11 ubuntu1804 ubuntu2004
 
 DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
 MAINTAINER=Arvados Package Maintainers <packaging@arvados.org>
@@ -36,8 +35,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:
@@ -66,12 +68,13 @@ 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 ~/go/bin/arvados-server
-       ~/go/bin/arvados-server install -type test
+       ls -l $(GOPATH)/bin/arvados-server
+       $(GOPATH)/bin/arvados-server install -type test
 
-yarn-install: arvados-server-install
+yarn-install:
        yarn install
 
 unit-tests: yarn-install
@@ -82,10 +85,35 @@ integration-tests: yarn-install check-arvados-directory
        $(WORKSPACE)/tools/run-integration-tests.sh -a $(ARVADOS_DIRECTORY)
 
 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 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
 
 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
+       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
 
@@ -125,16 +153,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
@@ -144,15 +171,20 @@ 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 .)