X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/76fa562c91e96ff7f128d8eba0785c2ee4a606cc..96626db04a7dcb11b21d92203a6ddd81577191bf:/Makefile

diff --git a/Makefile b/Makefile
index d90d8e81..64fe9e56 100644
--- a/Makefile
+++ b/Makefile
@@ -8,28 +8,19 @@ SHELL := /bin/bash
 
 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" .)
-
-# 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)
-
 # 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/
@@ -42,7 +33,7 @@ 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
@@ -69,11 +60,20 @@ clean: clean-rpm clean-deb clean-node-modules
 yarn-install:
 	yarn install
 
-test: yarn-install
+unit-tests: yarn-install
 	yarn test --no-watchAll --bail --ci
 
-build: test
-	yarn build
+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 \
@@ -106,8 +106,8 @@ $(RPM_FILE): build
 	 $(WORKSPACE)/build/=$(DEST_DIR)
 
 copy: $(DEB_FILE) $(RPM_FILE)
-	mkdir packages
-	for target in $^ ; do \
+	for target in $(TARGETS) ; do \
+	        mkdir -p packages/$$target
 		if [[ $$target =~ ^centos ]]; then
 			cp -p $(RPM_FILE) packages/$$target ; \
 		else
@@ -119,3 +119,6 @@ copy: $(DEB_FILE) $(RPM_FILE)
 
 # use FPM to create DEB and RPM
 packages: copy
+
+workbench2-build-image:
+	(cd docker && docker build -t workbench2-build .)