X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ff96e1a01d66e96fedb38a42b9350d40cfb281c0..HEAD:/Makefile

diff --git a/Makefile b/Makefile
index 4458f21480..8159f5feee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,40 +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)
-
-# 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 debian8 debian9 debian10 ubuntu1404 ubuntu1604 ubuntu1804"
-
-DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
-MAINTAINER=Ward Vandewege <wvandewege@veritasgenetics.com>
-
-# DEST_DIR will have the build package copied.
-DEST_DIR=/var/www/arvados-workbench2/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
-
 help:
 	@echo >&2
 	@echo >&2 "There is no default make target here.  Did you mean 'make test'?"
@@ -45,71 +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
-
-yarn-install:
-	yarn install
-
-test: yarn-install
-	yarn test --no-watchAll --bail --ci
-
-build: test
-	VERSION=$(VERSION) 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/workbench2/workbench2.example.json" \
-	$(WORKSPACE)/build/=$(DEST_DIR)
-
-$(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/workbench2/workbench2.example.json" \
-	 $(WORKSPACE)/build/=$(DEST_DIR)
-
-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
-
-workbench2-build-image:
-	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}