From 8e6658109476bdca15e2f5626b07e116d304b84a Mon Sep 17 00:00:00 2001
From: Tiago Quelhas <tjgq@google.com>
Date: Tue, 30 May 2023 12:09:40 +0200
Subject: [PATCH] [6.3.0] Extend the credential helper default timeout to 10s.

The default timeout makes the integration tests 1% flaky on RBE.

PiperOrigin-RevId: 535255555
Change-Id: I8270ffbfcbd00ec7c38a92a546d5726f1b10b68d
---
 .../google/devtools/build/lib/authandtls/AuthAndTLSOptions.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java b/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java
index ae592aafac8981..67fb9492012703 100644
--- a/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java
@@ -161,7 +161,7 @@ public class AuthAndTLSOptions extends OptionsBase {
 
   @Option(
       name = "experimental_credential_helper_timeout",
-      defaultValue = "5s",
+      defaultValue = "10s",
       converter = DurationConverter.class,
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.UNKNOWN},