X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/9217ddf079cb81d105c9c5927ad0c7c5ac1040ee..eb633efdb3fa8ecb0c2c6a5e35916585282436ea:/Makefile

diff --git a/Makefile b/Makefile
index 68d10574..6da3ed10 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,39 @@
 #
 # 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
-#Get version from the latest tag plus timsetamp
-GIT_TAG?=$(shell git describe --abbrev=0)
-TS_GIT?=$(shell git log -n1 --first-parent "--format=format:%ct" .)
-DATE_FROM_TS_GIT?=$(shell date -ud @$(TS_GIT) +%Y%m%d%H%M%S)
-CI_VERSION?="$(GIT_TAG).$(DATE_FROM_TS_GIT)"	
+
+# 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 debian10 ubuntu1404 ubuntu1604 ubuntu1804 ubuntu2004"
+
+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/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
+
 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'?"
@@ -20,23 +45,80 @@ help:
 	@echo >&2 "  Project home            --> https://arvados.org"
 	@echo >&2
 	@false
-clean:
-	@rm -f $(WORKSPACE)/*.deb
-	@rm -f $(WORKSPACE)/*.rpm
-test:
-	@yarn install
-	@yarn test	--no-watchAll --bail --ci
-
-build:
-	@yarn install
-	@yarn build
-
-package-version:
-	# Build deb and rpm packages using fpm from dist passing the destination folder for the deploy to be /var/www/arvados-workbench2/
-	@fpm -s dir -t deb  -n "$(APP_NAME)" -v "$(VERSION)" "--maintainer=Ward Vandewege <ward@curoverse.com>" --description "workbench2 Package" --deb-no-default-config-files $(WORKSPACE)/build/=/var/www/arvados-workbench2/workbench2/
-	@fpm -s dir -t rpm  -n "$(APP_NAME)" -v "$(VERSION)" "--maintainer=Ward Vandewege <ward@curoverse.com>" --description "workbench2 Package" $(WORKSPACE)/build/=/var/www/arvados-workbench2/workbench2/
-
-package-no-version:
-	# Build deb and rpm packages using fpm from dist passing the destination folder for the deploy to be /var/www/arvados-workbench2/
-	@fpm -s dir -t deb  -n "$(APP_NAME)" -v "$(CI_VERSION)" "--maintainer=Ward Vandewege <ward@curoverse.com>" --description "workbench2 Package" --deb-no-default-config-files $(WORKSPACE)/build/=/var/www/arvados-workbench2/workbench2/
-	@fpm -s dir -t rpm  -n "$(APP_NAME)" -v "$(CI_VERSION)" "--maintainer=Ward Vandewege <ward@curoverse.com>" --description "workbench2 Package" $(WORKSPACE)/build/=/var/www/arvados-workbench2/workbench2/
+
+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
+
+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: yarn-install
+	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:
+	(cd docker && docker build -t workbench2-build .)