[arvados] updated: 2.7.0-6197-gb7084ab5ec

[git repository hosting]

Summary of changes:
 build/run-tests.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

       via  b7084ab5ece7ad0ebc34c14ed0624f9e8f995ff4 (commit)
       via  6d20c830b3843023eb1600a7032bb0d54bb398ba (commit)
      from  8265e843a36b9fba46791728ca8170f3b12ce333 (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 b7084ab5ece7ad0ebc34c14ed0624f9e8f995ff4
Author: Tom Clegg <tom at curii.com>
Date:   Fri Mar 15 09:56:03 2024 -0400

    19744: Reorder python install steps to address dependency issue.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index b9160dedce..1f28915a29 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -971,11 +971,14 @@ install_services/api() {
 
 declare -a pythonstuff
 pythonstuff=(
+    # The ordering of sdk/python, tools/crunchstat-summary, and
+    # sdk/cwl here is significant. See
+    # https://dev.arvados.org/issues/19744#note-26
     sdk/python:py3
+    tools/crunchstat-summary:py3
     sdk/cwl:py3
     services/dockercleaner:py3
     services/fuse:py3
-    tools/crunchstat-summary:py3
 )
 
 declare -a gostuff
@@ -1054,6 +1057,7 @@ install_deps() {
     do_install env
     do_install cmd/arvados-server go
     do_install sdk/python pip "${VENV3DIR}/bin/"
+    do_install tools/crunchstat-summary pip "${VENV3DIR}/bin/"
     do_install sdk/ruby-google-api-client
     do_install sdk/ruby
     do_install sdk/cli

commit 6d20c830b3843023eb1600a7032bb0d54bb398ba
Author: Tom Clegg <tom at curii.com>
Date:   Thu Mar 14 15:25:46 2024 -0400

    21449: Fix ordering in "install deps".
    
    "install sdk/cli" is meant to use the current version of the arvados
    gem from this checkout, but that can only happen if "install sdk/ruby"
    runs first.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 55615a2985..b9160dedce 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -1053,10 +1053,10 @@ install_deps() {
     # Install parts needed by test suites
     do_install env
     do_install cmd/arvados-server go
-    do_install sdk/cli
     do_install sdk/python pip "${VENV3DIR}/bin/"
     do_install sdk/ruby-google-api-client
     do_install sdk/ruby
+    do_install sdk/cli
     do_install services/api
     # lib/controller integration tests depend on arv-mount to run
     # containers.

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


hooks/post-receive
--