19166: Merge branch 'main'

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

diff --cc cmd/arvados-server/cmd.go
Simple merge

diff --cc doc/_config.yml
Simple merge

diff --cc doc/admin/config-urls.html.textile.liquid
Simple merge

diff --cc lib/crunchrun/crunchrun.go
Simple merge

diff --cc lib/crunchrun/integration_test.go
index a18829f30d24d8a66673b8ed1fa073124eb13518,9860c7949727b169ccc1df66e15e4f223dc7e7cd..d569020824c22373d5098e0afd4c14d6156dd773
--- 1/lib/crunchrun/integration_test.go
--- 2/lib/crunchrun/integration_test.go
+++ b/lib/crunchrun/integration_test.go
@@@ -223,10 -223,13 +223,15 @@@ func (s *integrationSuite) TestRunTrivi
                        c.Check(log, trial.matchGetReq, `(?ms).*"reqMethod":"GET".*`)
                        c.Check(log, trial.matchPutReq, `(?ms).*"reqMethod":"PUT".*,"reqPath":"0e3bcff26d51c895a60ea0d4585e134d".*`)
                }
+ 
+               c.Check(s.logFiles["crunch-run.txt"], Matches, `(?ms).*using local keepstore process .* at http://[\d\.]{7,}:\d+.*`)
+               c.Check(s.logFiles["crunch-run.txt"], Not(Matches), `(?ms).* at http://127\..*`)
+               c.Check(s.logFiles["crunch-run.txt"], Not(Matches), `(?ms).* at http://169\.254\..*`)
+               c.Check(s.logFiles["stderr.txt"], Matches, `(?ms).*ARVADOS_KEEP_SERVICES=http://[\d\.]{7,}:\d+\n.*`)
        }
 +}
  
 +func (s *integrationSuite) TestRunTrivialContainerWithNoLocalKeepstore(c *C) {
        // Check that (1) config is loaded from $ARVADOS_CONFIG when
        // not provided on stdin and (2) if a local keepstore is not
        // started, crunch-run.txt explains why not.

diff --cc sdk/python/tests/run_test_server.py
Simple merge