16068: Fix flaky test maybe

[arvados-workbench2.git] / Makefile

diff --git a/Makefile b/Makefile
index 6cf9c29dad2cda5b56d61603d20d87da8124bfef..2236f9de4f78df396f3f0ba7be58d1cce726d44c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,12 +12,15 @@ 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 debian10 ubuntu1404 ubuntu1604 ubuntu1804 ubuntu2004"
+TARGETS?=centos7 debian10 debian11 ubuntu1804 ubuntu2004
 
 ARVADOS_DIRECTORY?=unset
 
@@ -59,7 +62,15 @@ 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
 
 unit-tests: yarn-install
@@ -75,7 +86,7 @@ integration-tests-in-docker: workbench2-build-image
 test: unit-tests integration-tests
 
 build: yarn-install
-       VERSION=$(VERSION) yarn build
+       VERSION=$(VERSION) BUILD_NUMBER=$(BUILD_NUMBER) GIT_COMMIT=$(GIT_COMMIT) yarn build
 
 $(DEB_FILE): build
        fpm \
@@ -89,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 \
@@ -104,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 \
@@ -122,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:
        (cd docker && docker build -t workbench2-build .)