[arvados] updated: 2.7.0-5318-ga5ce6f3013
git repository hosting
git at public.arvados.org
Thu Nov 9 20:29:03 UTC 2023
Summary of changes:
services/workbench2/Makefile | 44 +++++++++++++++++++++++++++--------
services/workbench2/docker/Dockerfile | 3 +--
2 files changed, 35 insertions(+), 12 deletions(-)
via a5ce6f3013a9924c40c71b04940759e127c98858 (commit)
via f3b8d03f7063b162355bccfd71aeb2b8b67bbdbb (commit)
via e14e00a5fb79be5cba5c8b9b0ae5863011f60daf (commit)
from a53bf7d89e01e98dcdc62b5357a0404d5489c9a1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit a5ce6f3013a9924c40c71b04940759e127c98858
Author: Tom Clegg <tom at curii.com>
Date: Thu Nov 9 14:52:00 2023 -0500
18874: Update test scripts to use wb2+arvados in same repo.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/services/workbench2/Makefile b/services/workbench2/Makefile
index 27ce0d670e..7e70f3ec9d 100644
--- a/services/workbench2/Makefile
+++ b/services/workbench2/Makefile
@@ -23,8 +23,6 @@ ITERATION?=1
TARGETS?=centos7 rocky8 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 at arvados.org>
@@ -40,6 +38,8 @@ RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
GOPATH=$(shell go env GOPATH)
export WORKSPACE?=$(shell pwd)
+ARVADOS_DIRECTORY?=$(shell env -C $(WORKSPACE) git rev-parse --show-toplevel)
+
.PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
help:
@@ -85,13 +85,35 @@ integration-tests: yarn-install check-arvados-directory
$(WORKSPACE)/tools/run-integration-tests.sh -a $(ARVADOS_DIRECTORY)
integration-tests-in-docker: workbench2-build-image check-arvados-directory
- docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make arvados-server-install integration-tests
+ docker run -ti --rm \
+ --env ARVADOS_DIRECTORY=/usr/src/arvados \
+ --env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
+ -v $(WORKSPACE):/usr/src/arvados/services/workbench2 \
+ -v $(ARVADOS_DIRECTORY):/usr/src/arvados \
+ -w /usr/src/arvados/services/workbench2 \
+ workbench2-build \
+ make arvados-server-install integration-tests
unit-tests-in-docker: workbench2-build-image check-arvados-directory
- docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make arvados-server-install unit-tests
+ docker run -ti --rm \
+ --env ARVADOS_DIRECTORY=/usr/src/arvados \
+ --env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
+ -v $(WORKSPACE):/usr/src/arvados/services/workbench2 \
+ -v $(ARVADOS_DIRECTORY):/usr/src/arvados \
+ -w /usr/src/arvados/services/workbench2 \
+ workbench2-build \
+ make arvados-server-install unit-tests
tests-in-docker: workbench2-build-image check-arvados-directory
- docker run -t -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados -e ci="${ci}" workbench2-build make test
+ docker run -ti --rm \
+ --env ARVADOS_DIRECTORY=/usr/src/arvados \
+ --env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
+ --env ci="${ci}" \
+ -v $(WORKSPACE):/usr/src/arvados/services/workbench2 \
+ -v$(ARVADOS_DIRECTORY):/usr/src/arvados \
+ -w /usr/src/arvados/services/workbench2 \
+ workbench2-build \
+ make test
test: unit-tests integration-tests
@@ -149,14 +171,16 @@ check-arvados-directory:
@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" \
+ docker run -t --rm --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 \
+ --env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
+ -w "/tmp/workbench2" \
+ -v ${WORKSPACE}:/tmp/workbench2 \
+ -v ${ARVADOS_DIRECTORY}:/tmp/arvados \
+ workbench2-build:latest \
sh -c 'git config --global --add safe.directory /tmp/workbench2 && make packages'
workbench2-build-image:
diff --git a/services/workbench2/docker/Dockerfile b/services/workbench2/docker/Dockerfile
index f529b796d1..4942ca0a57 100644
--- a/services/workbench2/docker/Dockerfile
+++ b/services/workbench2/docker/Dockerfile
@@ -33,5 +33,4 @@ RUN cd /usr/src/arvados && \
rm -rf arvados && \
apt-get clean
-RUN git config --global --add safe.directory /usr/src/arvados && \
- git config --global --add safe.directory /usr/src/workbench2
\ No newline at end of file
+RUN git config --global --add safe.directory /usr/src/arvados
commit f3b8d03f7063b162355bccfd71aeb2b8b67bbdbb
Merge: a53bf7d89e e14e00a5fb
Author: Tom Clegg <tom at curii.com>
Date: Thu Nov 9 11:50:53 2023 -0500
18874: Merge branch 'main' from arvados-workbench2.git
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --cc services/workbench2/Makefile
index 4d94661b33,0000000000..27ce0d670e
mode 100644,000000..100644
--- a/services/workbench2/Makefile
+++ b/services/workbench2/Makefile
@@@ -1,163 -1,0 +1,163 @@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Use bash, and run all lines in each recipe as one shell command
+SHELL := /bin/bash
+.ONESHELL:
+
+GOPATH?=~/go
+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?=$(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 rocky8 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 at arvados.org>
+
+# DEST_DIR will have the build package copied.
+DEST_DIR=/var/www/$(APP_NAME)/workbench2/
+
+# Debian package file
+DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
+
+# redHat package file
+RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
+
+GOPATH=$(shell go env GOPATH)
+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'?"
+ @echo >&2
+ @echo >&2 "More info:"
+ @echo >&2 " Installing --> http://doc.arvados.org/install"
+ @echo >&2 " Developing/contributing --> https://dev.arvados.org"
+ @echo >&2 " Project home --> https://arvados.org"
+ @echo >&2
+ @false
+
+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
+
+arvados-server-install: check-arvados-directory
+ cd $(ARVADOS_DIRECTORY)
+ go mod download
+ cd cmd/arvados-server
+ echo GOPATH is $(GOPATH)
+ GOFLAGS=-buildvcs=false go install
+ cd -
+ ls -l $(GOPATH)/bin/arvados-server
+ $(GOPATH)/bin/arvados-server install -type test
+
+yarn-install:
+ yarn install
+
+unit-tests: yarn-install
+ yarn test --no-watchAll --bail --ci
+
+integration-tests: yarn-install check-arvados-directory
+ yarn run cypress install
+ $(WORKSPACE)/tools/run-integration-tests.sh -a $(ARVADOS_DIRECTORY)
+
+integration-tests-in-docker: workbench2-build-image check-arvados-directory
+ docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make arvados-server-install integration-tests
+
+unit-tests-in-docker: workbench2-build-image check-arvados-directory
+ docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make arvados-server-install unit-tests
+
+tests-in-docker: workbench2-build-image check-arvados-directory
+ docker run -t -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados -e ci="${ci}" workbench2-build make test
+
+test: unit-tests integration-tests
+
+build: yarn-install
+ VERSION=$(VERSION) BUILD_NUMBER=$(BUILD_NUMBER) GIT_COMMIT=$(GIT_COMMIT) 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/$(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 \
+ -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/$(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 \
+ mkdir -p "packages/$$target" && \
+ case "$$target" in \
+ centos*|rocky*) cp -p "$(RPM_FILE)" "packages/$$target" ;; \
+ debian*|ubuntu*) cp -p "$(DEB_FILE)" "packages/$$target" ;; \
+ *) echo "Unknown copy target $$target"; exit 1 ;; \
+ esac ; \
+ done ; \
+ rm -f "$(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
++ sh -c 'git config --global --add safe.directory /tmp/workbench2 && make packages'
+
+workbench2-build-image:
+ (cd docker && docker build -t workbench2-build .)
commit e14e00a5fb79be5cba5c8b9b0ae5863011f60daf
Author: Tom Clegg <tom at curii.com>
Date: Thu Nov 9 10:03:22 2023 -0500
Fix "detected dubious ownership in repository" git error.
No issue #
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/Makefile b/Makefile
index bbdd4b37ed..0220adadc2 100644
--- a/Makefile
+++ b/Makefile
@@ -156,7 +156,7 @@ packages-in-docker: check-arvados-directory workbench2-build-image
-w="/tmp/workbench2" \
-t -v ${WORKSPACE}:/tmp/workbench2 \
-v ${ARVADOS_DIRECTORY}:/tmp/arvados workbench2-build:latest \
- make packages
+ sh -c 'git config --global --add safe.directory /tmp/workbench2 && make packages'
workbench2-build-image:
(cd docker && docker build -t workbench2-build .)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list