From afc309731ff7abf705fcb58e68a6ffcfddd212fd Mon Sep 17 00:00:00 2001
From: cpagravel <chrisgravel@live.com>
Date: Fri, 22 Jul 2022 16:24:18 -0700
Subject: [PATCH] Cherry-pick - GCB Queue TTL, Chef build size limit increase
 (#5)

* GCB Queue TTL (#20748)

* Set build q time to 6 hr

* README

* Restyel

* Chef - Increase cloudbuild size limit (#21119)

Co-authored-by: Austin Bozowski <bozowski@google.com>
---
 integrations/cloudbuild/README.md       | 3 ++-
 integrations/cloudbuild/build-all.yaml  | 3 ++-
 integrations/cloudbuild/chef.yaml       | 3 ++-
 integrations/cloudbuild/smoke-test.yaml | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/integrations/cloudbuild/README.md b/integrations/cloudbuild/README.md
index dd0e6be876a116..dd037a88ae4d54 100644
--- a/integrations/cloudbuild/README.md
+++ b/integrations/cloudbuild/README.md
@@ -6,7 +6,8 @@ Follow https://cloud.google.com/sdk/docs/install.
 
 #### Local execution
 
-In order to test locally, comment out the `machineType` entry in the build yaml.
+In order to test locally, comment out the `machineType` and `queueTtl` entry in
+the build yaml.
 
 ```
 # Once only setup:
diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
index 0bdffaf02e1ae9..096575b2422548 100644
--- a/integrations/cloudbuild/build-all.yaml
+++ b/integrations/cloudbuild/build-all.yaml
@@ -31,7 +31,8 @@ steps:
 logsBucket: matter-build-automation-build-logs
 
 # Global timeout for all steps
-timeout: 14400s
+timeout: 21600s
+queueTtl: 21600s
 
 artifacts:
     objects:
diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml
index 48ae97a4d925b0..9136a265196e39 100644
--- a/integrations/cloudbuild/chef.yaml
+++ b/integrations/cloudbuild/chef.yaml
@@ -44,6 +44,7 @@ logsBucket: matter-build-automation-build-logs
 
 # Global timeout for all steps
 timeout: 14400s
+queueTtl: 21600s
 
 artifacts:
     objects:
@@ -53,4 +54,4 @@ artifacts:
 # slow.
 options:
     machineType: "E2_HIGHCPU_32"
-    diskSizeGb: 200
+    diskSizeGb: 500
diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
index 5f1c9ac262af50..d3d676768f1940 100644
--- a/integrations/cloudbuild/smoke-test.yaml
+++ b/integrations/cloudbuild/smoke-test.yaml
@@ -100,6 +100,7 @@ logsBucket: matter-build-automation-build-logs
 
 # Global timeout for all steps
 timeout: 9000s
+queueTtl: 21600s
 
 artifacts:
     objects: