[arvados] updated: 2.7.0-5357-g80d78568ad

[git repository hosting]

Summary of changes:
 doc/README.textile                                       |  6 ------
 doc/architecture/index.html.textile.liquid               |  2 +-
 lib/install/deps_test.go                                 |  1 -
 services/api/config/initializers/reload_config.rb        |  3 ---
 services/api/lib/app_version.rb                          |  3 ---
 tools/arvbox/lib/arvbox/docker/service/ready/run-service | 13 ++++---------
 6 files changed, 5 insertions(+), 23 deletions(-)

       via  80d78568ad6db963963df50428d84d6433331493 (commit)
       via  04415797e57ce4caf8d5c9872d119b1f117dfc36 (commit)
       via  f004eb91960dddb9bf2ada5a7c1bd6852a61c2fe (commit)
      from  6442a780c60d9144a062c8af6b887f3213005751 (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 80d78568ad6db963963df50428d84d6433331493
Author: Tom Clegg <tom at curii.com>
Date:   Mon Nov 13 11:00:15 2023 -0500

    20690: Remove wb1 from arvbox gem install progress indicator.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/tools/arvbox/lib/arvbox/docker/service/ready/run-service b/tools/arvbox/lib/arvbox/docker/service/ready/run-service
index b19edaf25a..6c104bf9b7 100755
--- a/tools/arvbox/lib/arvbox/docker/service/ready/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/ready/run-service
@@ -64,15 +64,10 @@ fi
 if ! [[ -z "$waiting" ]] ; then
     if ps x | grep -v grep | grep "bundle install" > /dev/null; then
         gemcount=$(ls /var/lib/arvados/lib/ruby/gems/*/gems /var/lib/arvados-arvbox/.gem/ruby/*/gems 2>/dev/null | wc -l)
-
-        gemlockcount=0
-        for l in /usr/src/arvados/services/api/Gemfile.lock \
-                     /usr/src/arvados/apps/workbench/Gemfile.lock ; do
-            gc=$(cat $l \
-                        | grep -vE "(GEM|PLATFORMS|DEPENDENCIES|BUNDLED|GIT|$^|remote:|specs:|revision:)" \
-                        | sed 's/^ *//' | sed 's/(.*)//' | sed 's/ *$//' | sort | uniq | wc -l)
-            gemlockcount=$(($gemlockcount + $gc))
-        done
+        lockfile=/usr/src/arvados/services/api/Gemfile.lock
+        gemlockcount=$(cat $lockfile \
+                           | grep -vE "(GEM|PLATFORMS|DEPENDENCIES|BUNDLED|GIT|$^|remote:|specs:|revision:)" \
+                           | sed 's/^ *//' | sed 's/(.*)//' | sed 's/ *$//' | sort | uniq | wc -l)
         waiting="$waiting (installing ruby gems $gemcount of about $gemlockcount)"
     fi
 

commit 04415797e57ce4caf8d5c9872d119b1f117dfc36
Author: Tom Clegg <tom at curii.com>
Date:   Mon Nov 13 10:59:21 2023 -0500

    20690: Remove wb1 bind mount in test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/deps_test.go b/lib/install/deps_test.go
index 08187ce9db..b9274b425c 100644
--- a/lib/install/deps_test.go
+++ b/lib/install/deps_test.go
@@ -27,7 +27,6 @@ sourcepath="$(realpath ../..)"
 docker run -i --rm --workdir /arvados \
        -v ${tmp}/arvados-server:/arvados-server:ro \
        -v ${sourcepath}:/arvados:ro \
-       -v /arvados/apps/workbench/.bundle \
        -v /arvados/services/api/.bundle \
        -v /arvados/services/api/tmp \
        --env http_proxy \

commit f004eb91960dddb9bf2ada5a7c1bd6852a61c2fe
Author: Tom Clegg <tom at curii.com>
Date:   Mon Nov 13 10:58:56 2023 -0500

    20690: Remove obsolete docs/comments about wb1.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/doc/README.textile b/doc/README.textile
index 47951299cc..4c807a3dd6 100644
--- a/doc/README.textile
+++ b/doc/README.textile
@@ -71,12 +71,6 @@ You can set @baseurl@ (the URL prefix for all internal links), @arvados_cluster_
 arvados/doc$ bundle exec rake generate baseurl=/doc arvados_api_host=xyzzy.arvadosapi.com
 </pre>
 
-Make the docs appear at {workbench_host}/doc by creating a symbolic link in Workbench's @public@ directory, pointing to the generated HTML tree.
-
-<pre>
-arvados/doc$ ln -sn ../../../doc/.site ../apps/workbench/public/doc
-</pre>
-
 h2. Delete generated files
 
 <pre>
diff --git a/doc/architecture/index.html.textile.liquid b/doc/architecture/index.html.textile.liquid
index 09d593db2b..f5405c16e1 100644
--- a/doc/architecture/index.html.textile.liquid
+++ b/doc/architecture/index.html.textile.liquid
@@ -14,7 +14,7 @@ SPDX-License-Identifier: CC-BY-SA-3.0
 
 h3. Services
 
-Located in @arvados/services@ except for Workbench which is located in @arvados/apps/workbench at .
+Located in @arvados/services at .
 
 table(table table-bordered table-condensed).
 |_. Component|_. Description|
diff --git a/services/api/config/initializers/reload_config.rb b/services/api/config/initializers/reload_config.rb
index 22eee1601b..f6ef8af963 100644
--- a/services/api/config/initializers/reload_config.rb
+++ b/services/api/config/initializers/reload_config.rb
@@ -2,9 +2,6 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-# When updating this, please make the same changes in
-# apps/workbench/config/initializers/reload_config.rb as well.
-
 def start_reload_thread
   Thread.new do
     lockfile = Rails.root.join('tmp', 'reload_config.lock')
diff --git a/services/api/lib/app_version.rb b/services/api/lib/app_version.rb
index 335608b2b6..95685ea5fe 100644
--- a/services/api/lib/app_version.rb
+++ b/services/api/lib/app_version.rb
@@ -2,9 +2,6 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-# If you change this file, you'll probably also want to make the same
-# changes in apps/workbench/lib/app_version.rb.
-
 class AppVersion
   def self.git(*args, &block)
     IO.popen(["git", "--git-dir", ".git"] + args, "r",

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


hooks/post-receive
--