Merge branch '17756-dispatch-lsf' into main

closes #17756

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --cc build/run-build-packages.sh
Simple merge

diff --cc doc/_config.yml
Simple merge

diff --cc lib/config/export.go
Simple merge

diff --cc services/crunch-dispatch-local/crunch-dispatch-local.go
Simple merge

diff --cc services/crunch-dispatch-local/crunch-dispatch-local_test.go
index d976bf0812950488b796cb063def8c960d128849,6ec31b1737f5a21004226f4bad31bf8fc504a970..92b8d2adcd6fe22e20c66afc1d4f803521ccd545
--- 1/services/crunch-dispatch-local/crunch-dispatch-local_test.go
--- 2/services/crunch-dispatch-local/crunch-dispatch-local_test.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
@@@ -81,11 -81,9 +81,11 @@@ func (s *TestSuite) TestIntegration(c *
                return cmd.Start()
        }
  
-       dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {
-               (&LocalRun{startCmd, make(chan bool, 8), ctx, &cl}).run(d, c, s)
-               cancel()
 +      cl := arvados.Cluster{Containers: arvados.ContainersConfig{RuntimeEngine: "docker"}}
 +
 -              return (&LocalRun{startCmd, make(chan bool, 8), ctx}).run(d, c, s)
+       dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) error {
+               defer cancel()
++              return (&LocalRun{startCmd, make(chan bool, 8), ctx, &cl}).run(d, c, s)
        }
  
        err = dispatcher.Run(ctx)
@@@ -186,11 -184,9 +186,11 @@@ func testWithServerStub(c *C, apiStubRe
                return cmd.Start()
        }
  
-       dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) {
-               (&LocalRun{startCmd, make(chan bool, 8), ctx, &cl}).run(d, c, s)
-               cancel()
 +      cl := arvados.Cluster{Containers: arvados.ContainersConfig{RuntimeEngine: "docker"}}
 +
 -              return (&LocalRun{startCmd, make(chan bool, 8), ctx}).run(d, c, s)
+       dispatcher.RunContainer = func(d *dispatch.Dispatcher, c arvados.Container, s <-chan arvados.Container) error {
+               defer cancel()
++              return (&LocalRun{startCmd, make(chan bool, 8), ctx, &cl}).run(d, c, s)
        }
  
        re := regexp.MustCompile(`(?ms).*` + expected + `.*`)

diff --cc services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
Simple merge