Explorar o código

Merge "Ignore USE_RBE when on glinux laptops"

Treehugger Robot hai 10 meses
pai
achega
10fb90c339
Modificáronse 1 ficheiros con 6 adicións e 0 borrados
  1. 6 0
      ui/build/config.go

+ 6 - 0
ui/build/config.go

@@ -1375,6 +1375,12 @@ func (c *configImpl) StartGoma() bool {
 }
 
 func (c *configImpl) UseRBE() bool {
+	authType, _ := c.rbeAuth()
+	// Do not use RBE with prod credentials in scenarios when stubby doesn't exist, since
+	// its unlikely that we will be able to obtain necessary creds without stubby.
+	if !c.StubbyExists() && strings.Contains(authType, "use_google_prod_creds"){
+		return false
+	}
 	if v, ok := c.Environment().Get("USE_RBE"); ok {
 		v = strings.TrimSpace(v)
 		if v != "" && v != "false" {