16068: Fix flaky test maybe

[arvados-workbench2.git] / Makefile

diff --git a/Makefile b/Makefile
index 0963b7c9a91474e1efbf4063658a816aad336ed3..2236f9de4f78df396f3f0ba7be58d1cce726d44c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,18 +12,23 @@ APP_NAME?=arvados-workbench2
 # 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 debian8 debian9 debian10 ubuntu1404 ubuntu1604 ubuntu1804"
+TARGETS?=centos7 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/arvados-workbench2/workbench2/
+DEST_DIR=/var/www/$(APP_NAME)/workbench2/
 
 # Debian package file
 DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
@@ -33,7 +38,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
@@ -57,14 +62,31 @@ clean-node-modules:
 
 clean: clean-rpm clean-deb clean-node-modules
 
-yarn-install:
+arvados-server-install:
+       cd $(ARVADOS_DIRECTORY)
+       go mod download
+       cd cmd/arvados-server
+       go install
+       cd -
+       ~/go/bin/arvados-server install -type test
+
+yarn-install: arvados-server-install
        yarn install
 
-test: yarn-install
+unit-tests: yarn-install
        yarn test --no-watchAll --bail --ci
 
-build: test
-       VERSION=$(VERSION) yarn build
+integration-tests: yarn-install
+       yarn run cypress install
+       $(WORKSPACE)/tools/run-integration-tests.sh -a $(ARVADOS_DIRECTORY)
+
+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) BUILD_NUMBER=$(BUILD_NUMBER) GIT_COMMIT=$(GIT_COMMIT) yarn build
 
 $(DEB_FILE): build
        fpm \
@@ -78,8 +100,9 @@ $(DEB_FILE): build
         --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)
+        --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 \
@@ -93,8 +116,9 @@ $(RPM_FILE): build
         --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)
+        --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 \
@@ -111,5 +135,20 @@ copy: $(DEB_FILE) $(RPM_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:
-       docker build -t workbench2-build .
+       (cd docker && docker build -t workbench2-build .)