[arvados] updated: 2.7.0-5094-gb24f2530ae

[git repository hosting]

Summary of changes:
 lib/boot/cmd.go        |  2 +-
 lib/boot/supervisor.go |  5 +----
 lib/install/deps.go    | 26 +++++++++++++++++++-------
 3 files changed, 21 insertions(+), 12 deletions(-)

       via  b24f2530ae41644a7eb9cfe28679182d76468737 (commit)
       via  d1e529905d4820ce450dc430139cccda83fefc72 (commit)
       via  39148384fb309688be71b666a7bcf08357127808 (commit)
      from  9ddc63bf01d4603bb373957ce9649da50e7ecd55 (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 b24f2530ae41644a7eb9cfe28679182d76468737
Author: Tom Clegg <tom at curii.com>
Date:   Thu Oct 26 11:23:43 2023 -0400

    20846: Fix workbench2 build recipe.
    
    Install recipe was failing on readonly source tree, e.g., mounted into
    a docker container by `arvados-package build`.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 0d238d06fa..3784cf6a18 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -677,11 +677,24 @@ done
 			return 1
 		}
 
-		// Install workbench2 app to /var/lib/arvados/workbench2/
+		// Install workbench2 app to
+		// /var/lib/arvados/workbench2/.
+		//
+		// We copy the source tree from the (possibly
+		// readonly) source tree into a temp dir because `yarn
+		// build` writes to {source-tree}/build/. When we
+		// upgrade to react-scripts >= 4.0.2 we may be able to
+		// build from the source dir and write directly to the
+		// final destination (using
+		// YARN_INSTALL_STATE_PATH=/dev/null
+		// BUILD_PATH=/var/lib/arvados/workbench2) instead of
+		// using two rsync steps here.
 		if err = inst.runBash(`
-cd `+inst.SourcePath+`/services/workbench2
-VERSION="`+inst.PackageVersion+`" BUILD_NUMBER=1 GIT_COMMIT=000000000 yarn build
-rsync -a --delete-after build/ /var/lib/arvados/workbench2/
+tmp=/var/lib/arvados/tmp/workbench2
+trap "rm -r ${tmp}" ERR EXIT
+rsync -a --delete-after `+inst.SourcePath+`/services/workbench2/ "$tmp/"
+env -C "$tmp" VERSION="`+inst.PackageVersion+`" BUILD_NUMBER=1 GIT_COMMIT=000000000 yarn build
+rsync -a --delete-after "$tmp/build/" /var/lib/arvados/workbench2/
 `, stdout, stderr); err != nil {
 			return 1
 		}

commit d1e529905d4820ce450dc430139cccda83fefc72
Author: Tom Clegg <tom at curii.com>
Date:   Thu Oct 26 09:45:45 2023 -0400

    20846: Fix python build recipe.
    
    See #20846#note-13.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index e15a386d16..0d238d06fa 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -604,9 +604,8 @@ pip3 install --no-cache-dir 'setuptools>=62.4.0' 'pip>=7'
 export ARVADOS_BUILDING_VERSION="`+inst.PackageVersion+`"
 for src in "`+inst.SourcePath+`/sdk/python" "`+inst.SourcePath+`/services/fuse"; do
   rsync -a --delete-after "$src/" "$tmp/"
-  cd "$tmp"
-  python3 setup.py install
-  cd ..
+  env -C "$tmp" python3 setup.py build
+  pip3 install "$tmp"
   rm -rf "$tmp"
 done
 `, stdout, stderr); err != nil {

commit 39148384fb309688be71b666a7bcf08357127808
Author: Tom Clegg <tom at curii.com>
Date:   Wed Oct 25 15:52:58 2023 -0400

    20846: Disable workbench1 in `arvados-server boot`.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index 41a2dab5ed..3d653e97af 100644
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -69,7 +69,7 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std
 	flags.StringVar(&super.ClusterType, "type", "production", "cluster `type`: development, test, or production")
 	flags.StringVar(&super.ListenHost, "listen-host", "127.0.0.1", "host name or interface address for internal services whose InternalURLs are not configured")
 	flags.StringVar(&super.ControllerAddr, "controller-address", ":0", "desired controller address, `host:port` or `:port`")
-	flags.BoolVar(&super.NoWorkbench1, "no-workbench1", false, "do not run workbench1")
+	flags.BoolVar(&super.NoWorkbench1, "no-workbench1", true, "do not run workbench1")
 	flags.BoolVar(&super.NoWorkbench2, "no-workbench2", false, "do not run workbench2")
 	flags.BoolVar(&super.OwnTemporaryDatabase, "own-temporary-database", false, "bring up a postgres server and create a temporary database")
 	timeout := flags.Duration("timeout", 0, "maximum time to wait for cluster to be ready")
diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index e913a7fe08..abec2b0f4a 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -371,10 +371,7 @@ func (super *Supervisor) runCluster() error {
 		}},
 	}
 	if !super.NoWorkbench1 {
-		tasks = append(tasks,
-			installPassenger{src: "apps/workbench", varlibdir: "workbench1", depends: []supervisedTask{railsDatabase{}}}, // dependency ensures workbench doesn't delay api install/startup
-			runPassenger{src: "apps/workbench", varlibdir: "workbench1", svc: super.cluster.Services.Workbench1, depends: []supervisedTask{installPassenger{src: "apps/workbench", varlibdir: "workbench1"}}},
-		)
+		return errors.New("workbench1 is no longer supported")
 	}
 	if !super.NoWorkbench2 {
 		tasks = append(tasks,

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


hooks/post-receive
--