X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f1b1d63cd6dcb29951e456e487db7d7afdeafa69..52fa01051f4633e3bbbfcdf8c55994e7cd91212a:/Makefile

diff --git a/Makefile b/Makefile
index 0c618fd096..8159f5feee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,45 +1,8 @@
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
-# SPDX-License-Identifier: Apache-2.0
-
-# Use bash, and run all lines in each recipe as one shell command
-SHELL := /bin/bash
-.ONESHELL:
-
-APP_NAME?=arvados-workbench2
-
-# 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
-VERSION?=$(shell ./version-at-commit.sh HEAD)
-# We don't use BUILD_NUMBER at the moment, but it needs to be defined
-BUILD_NUMBER?=0
-GIT_COMMIT?=$(shell git rev-parse --short HEAD)
-
-# ITERATION is the package iteration, intended for manual change if anything non-code related
-# changes in the package. (i.e. example config files externally added
-ITERATION?=1
-
-TARGETS?=centos7 rocky8 debian10 debian11 ubuntu1804 ubuntu2004
-
-ARVADOS_DIRECTORY?=unset
-
-DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
-MAINTAINER=Arvados Package Maintainers <packaging@arvados.org>
-
-# DEST_DIR will have the build package copied.
-DEST_DIR=/var/www/$(APP_NAME)/workbench2/
-
-# Debian package file
-DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
-
-# redHat package file
-RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
+# SPDX-License-Identifier: AGPL-3.0
 
 export WORKSPACE?=$(shell pwd)
-
-.PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
-
 help:
 	@echo >&2
 	@echo >&2 "There is no default make target here.  Did you mean 'make test'?"
@@ -50,109 +13,9 @@ help:
 	@echo >&2 "  Project home            --> https://arvados.org"
 	@echo >&2
 	@false
-
-clean-deb:
-	rm -f $(WORKSPACE)/*.deb
-
-clean-rpm:
-	rm -f $(WORKSPACE)/*.rpm
-
-clean-node-modules:
-	rm -rf $(WORKSPACE)/node_modules
-
-clean: clean-rpm clean-deb clean-node-modules
-
-arvados-server-install: check-arvados-directory
-	cd $(ARVADOS_DIRECTORY)
-	go mod download
-	cd cmd/arvados-server
-	go install
-	cd -
-	ls -l ~/go/bin/arvados-server
-	~/go/bin/arvados-server install -type test
-
-yarn-install: arvados-server-install
-	yarn install
-
-unit-tests: yarn-install
-	yarn test --no-watchAll --bail --ci
-
-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 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
-
-test: unit-tests integration-tests
-
-build: yarn-install
-	VERSION=$(VERSION) BUILD_NUMBER=$(BUILD_NUMBER) GIT_COMMIT=$(GIT_COMMIT) yarn build
-
-$(DEB_FILE): build
-	fpm \
-	 -s dir \
-	 -t deb \
-	 -n "$(APP_NAME)" \
-	 -v "$(VERSION)" \
-	 --iteration "$(ITERATION)" \
-	 --vendor="The Arvados Authors" \
-	 --maintainer="$(MAINTAINER)" \
-	 --url="https://arvados.org" \
-	 --license="GNU Affero General Public License, version 3.0" \
-	 --description="$(DESCRIPTION)" \
-	 --config-files="etc/arvados/$(APP_NAME)/workbench2.example.json" \
-	$(WORKSPACE)/build/=$(DEST_DIR) \
-	etc/arvados/workbench2/workbench2.example.json=/etc/arvados/$(APP_NAME)/workbench2.example.json
-
-$(RPM_FILE): build
-	fpm \
-	 -s dir \
-	 -t rpm \
-	 -n "$(APP_NAME)" \
-	 -v "$(VERSION)" \
-	 --iteration "$(ITERATION)" \
-	 --vendor="The Arvados Authors" \
-	 --maintainer="$(MAINTAINER)" \
-	 --url="https://arvados.org" \
-	 --license="GNU Affero General Public License, version 3.0" \
-	 --description="$(DESCRIPTION)" \
-	 --config-files="etc/arvados/$(APP_NAME)/workbench2.example.json" \
-	 $(WORKSPACE)/build/=$(DEST_DIR) \
-	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)
-
-# use FPM to create DEB and RPM
-packages: copy
-
-check-arvados-directory:
-	@if test "${ARVADOS_DIRECTORY}" == "unset"; then echo "the environment variable ARVADOS_DIRECTORY must be set to the path of an arvados git checkout"; exit 1; fi
-	@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" \
-		--env ARVADOS_DIRECTORY=/tmp/arvados \
-		--env APP_NAME=${APP_NAME} \
-		--env ITERATION=${ITERATION} \
-		--env TARGETS="${TARGETS}" \
-		-w="/tmp/workbench2" \
-		-t -v ${WORKSPACE}:/tmp/workbench2 \
-		-v ${ARVADOS_DIRECTORY}:/tmp/arvados workbench2-build:latest \
-		make packages
-
-workbench2-build-image:
-	(cd docker && docker build -t workbench2-build .)
+test:
+	build/run-tests.sh ${TEST_FLAGS}
+packages:
+	build/run-build-packages-all-targets.sh ${PACKAGES_FLAGS}
+test-packages:
+	build/run-build-packages-all-targets.sh --test-packages ${PACKAGES_FLAGS}