X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b676312f840c3f12855a4392afe90b275dd25b97..f368c0809eb561a272c6e61f4f94f8a722e32c11:/Makefile

diff --git a/Makefile b/Makefile
index 07c3b200ea..0220adadc2 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,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
+TARGETS?=centos7 rocky8 debian10 debian11 ubuntu1804 ubuntu2004
 
 ARVADOS_DIRECTORY?=unset
 
@@ -36,6 +36,7 @@ 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)
 
 .PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
@@ -62,14 +63,15 @@ clean-node-modules:
 
 clean: clean-rpm clean-deb clean-node-modules
 
-arvados-server-install:
+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
@@ -77,13 +79,19 @@ yarn-install: arvados-server-install
 unit-tests: yarn-install
 	yarn test --no-watchAll --bail --ci
 
-integration-tests: yarn-install
+integration-tests: yarn-install check-arvados-directory
 	yarn run cypress install
 	$(WORKSPACE)/tools/run-integration-tests.sh -a $(ARVADOS_DIRECTORY)
 
-integration-tests-in-docker: workbench2-build-image
+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
 
+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
@@ -122,16 +130,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
@@ -149,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 .)