[arvados] updated: 2.5.0-202-g780138e1f

[git repository hosting]

Summary of changes:
 lib/controller/rpc/conn.go | 1 +
 lib/diagnostics/cmd.go     | 1 +
 2 files changed, 2 insertions(+)

       via  780138e1fe959456a5dd8d2225561acfb7c939a5 (commit)
      from  8bf73cc97939080f30a893131eaf4cb7232bdd47 (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 780138e1fe959456a5dd8d2225561acfb7c939a5
Author: Tom Clegg <tom at curii.com>
Date:   Wed Mar 1 15:16:39 2023 -0500

    19972: Disable auto-retry in diagnostics and rpc.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index 4d8a82ce4..8f28ccf14 100644
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -88,6 +88,7 @@ func (conn *Conn) requestAndDecode(ctx context.Context, dst interface{}, ep arva
 		Scheme:     conn.baseURL.Scheme,
 		APIHost:    conn.baseURL.Host,
 		SendHeader: conn.SendHeader,
+		Timeout:    0, // disable auto-retry
 	}
 	tokens, err := conn.tokenProvider(ctx)
 	if err != nil {
diff --git a/lib/diagnostics/cmd.go b/lib/diagnostics/cmd.go
index ed963e1ef..36dca86e5 100644
--- a/lib/diagnostics/cmd.go
+++ b/lib/diagnostics/cmd.go
@@ -131,6 +131,7 @@ func (diag *diagnoser) dotest(id int, title string, fn func() error) {
 
 func (diag *diagnoser) runtests() {
 	client := arvados.NewClientFromEnv()
+	client.Timeout = 0 // disable auto-retry, use context instead
 
 	if client.APIHost == "" || client.AuthToken == "" {
 		diag.errorf("ARVADOS_API_HOST and ARVADOS_API_TOKEN environment variables are not set -- aborting without running any tests")

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


hooks/post-receive
--