X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/969a16ec1b77f585675ae9cb9660e72682c99348..14903d601d6c878f1d772f0b91c0877891a2e78c:/Makefile

diff --git a/Makefile b/Makefile
index a543d464..4a8854c3 100644
--- a/Makefile
+++ b/Makefile
@@ -2,30 +2,25 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-APP_NAME?=arvados-workbench2
-
-# GIT_TAG is the last tagged stable release (i.e. 1.2.0)
-GIT_TAG?=$(shell git describe --abbrev=0)
-
-# TS_GIT is the timestamp in the current directory (i.e. 1528815021).
-# Note that it will only change if files change.
-TS_GIT?=$(shell git log -n1 --first-parent "--format=format:%ct" .)
+# Use bash, and run all lines in each recipe as one shell command
+SHELL := /bin/bash
+.ONESHELL:
 
-# DATE_FROM_TS_GIT is the human(ish)-readable version of TS_GIT
-# 1528815021 -> 20180612145021
-DATE_FROM_TS_GIT?=$(shell date -ud @$(TS_GIT) +%Y%m%d%H%M%S)
+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?=$(GIT_TAG).$(DATE_FROM_TS_GIT)
+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>
+MAINTAINER=Arvados Package Maintainers <packaging@arvados.org>
 
 # DEST_DIR will have the build package copied.
 DEST_DIR=/var/www/arvados-workbench2/workbench2/
@@ -34,11 +29,11 @@ DEST_DIR=/var/www/arvados-workbench2/workbench2/
 DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
 
 # redHat package file
-RPM_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION).x86_64.rpm
+RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
 
 export WORKSPACE?=$(shell pwd)
 
-.PHONY: help clean* yarn-install test build packages packages-with-version 
+.PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
 
 help:
 	@echo >&2
@@ -65,11 +60,20 @@ clean: clean-rpm clean-deb clean-node-modules
 yarn-install:
 	yarn install
 
-test: yarn-install
-	yarn test	--no-watchAll --bail --ci
+unit-tests: yarn-install
+	yarn test --no-watchAll --bail --ci
+
+integration-tests: yarn-install
+	yarn run cypress install
+	$(WORKSPACE)/tools/run-integration-tests.sh
+
+integration-tests-in-docker: workbench2-build-image
+	docker run -ti -v$(PWD):$(PWD) -w$(PWD) workbench2-build make integration-tests
+
+test: unit-tests integration-tests
 
 build: test
-	yarn build
+	VERSION=$(VERSION) yarn build
 
 $(DEB_FILE): build
 	fpm \
@@ -78,9 +82,12 @@ $(DEB_FILE): build
 	 -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)" \
-	 --deb-no-default-config-files \
+	 --config-files="etc/arvados/workbench2/workbench2.example.json" \
 	$(WORKSPACE)/build/=$(DEST_DIR)
 
 $(RPM_FILE): build
@@ -90,9 +97,28 @@ $(RPM_FILE): build
 	 -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: $(DEB_FILE) $(RPM_FILE)
+packages: copy
+
+workbench2-build-image:
+	(cd docker && docker build -t workbench2-build .)