[ARVADOS-WORKBENCH2] updated: 2.1.0-452-g2836087f

[Git user]

Summary of changes:
 Makefile                       | 12 +++++++++++-
 docker/Dockerfile              |  2 +-
 tools/run-integration-tests.sh | 10 ----------
 3 files changed, 12 insertions(+), 12 deletions(-)

       via  2836087f0d5c14548453bd169cfd019eb1c1413c (commit)
      from  e2914badd89549dc768298d9150af8b53a96e380 (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 2836087f0d5c14548453bd169cfd019eb1c1413c
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Wed Jul 7 16:30:50 2021 -0300

    17782: Makes "arvados-server install" a dependency of all tests.
    
    We need to make sure the correct nodejs version is installed before attempting
    to run "yarn install".
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/Makefile b/Makefile
index 1e923710..fca55e9f 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,17 @@ clean-node-modules:
 
 clean: clean-rpm clean-deb clean-node-modules
 
-yarn-install:
+arvados-server-install:
+	echo "Building & installing arvados-server..."
+	cd $(ARVADOS_DIRECTORY)
+	go mod download
+	cd cmd/arvados-server
+	go install
+	cd -
+	echo "Installing dev dependencies..."
+	~/go/bin/arvados-server install -type test
+
+yarn-install: arvados-server-install
 	yarn install
 
 unit-tests: yarn-install
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3d6aad70..390e1efa 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-FROM node:12.22.1-buster
+FROM debian:buster
 LABEL maintainer="Arvados Package Maintainers <packaging at arvados.org>"
 
 RUN echo deb http://deb.debian.org/debian buster-backports main >> /etc/apt/sources.list.d/backports.list
diff --git a/tools/run-integration-tests.sh b/tools/run-integration-tests.sh
index 159bfc1c..d5735e45 100755
--- a/tools/run-integration-tests.sh
+++ b/tools/run-integration-tests.sh
@@ -93,16 +93,6 @@ if [ ! -d "${ARVADOS_DIR}/.git" ]; then
     git clone https://git.arvados.org/arvados.git ${ARVADOS_DIR} || exit 1
 fi
 
-echo "Building & installing arvados-server..."
-cd ${ARVADOS_DIR}
-go mod download || exit 1
-cd cmd/arvados-server
-go install
-cd -
-
-echo "Installing dev dependencies..."
-~/go/bin/arvados-server install -type test || exit 1
-
 echo "Launching arvados in test mode..."
 coproc arvboot (~/go/bin/arvados-server boot \
     -type test \

-----------------------------------------------------------------------


hooks/post-receive
--