[arvados] updated: 2.6.0-4747-g5818625330

[git repository hosting]

Summary of changes:
 services/workbench2/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

       via  58186253302470783bbbb65813001165f13fb3d8 (commit)
      from  d1d683d326f597be8276df45aa8b7f7f6ae7d265 (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 58186253302470783bbbb65813001165f13fb3d8
Author: Tom Clegg <tom at curii.com>
Date:   Wed Aug 23 16:29:53 2023 -0400

    18874: Don't try to run arvados-server install from run-tests.sh.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/workbench2/Makefile b/services/workbench2/Makefile
index 569977abf1..7a733b6ab3 100644
--- a/services/workbench2/Makefile
+++ b/services/workbench2/Makefile
@@ -72,7 +72,7 @@ arvados-server-install: check-arvados-directory
 	ls -l $(GOPATH)/bin/arvados-server
 	$(GOPATH)/bin/arvados-server install -type test
 
-yarn-install: arvados-server-install
+yarn-install:
 	yarn install
 
 unit-tests: yarn-install
@@ -83,10 +83,10 @@ 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 integration-tests
+	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 unit-tests
+	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
 
 test: unit-tests integration-tests
 

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


hooks/post-receive
--