From fe5826da4e879b8b5fd36b36f63f51b529b17543 Mon Sep 17 00:00:00 2001
From: nturgut <nurhan@google.com>
Date: Thu, 30 Jul 2020 16:13:40 -0700
Subject: [PATCH 1/3] increase number of shards. make engine web tests same as
 flutter repo tests

---
 .cirrus.yml | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 5731441e4e0be..92702cb0326be 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -4,9 +4,11 @@ web_shard_template: &WEB_SHARD_TEMPLATE
   only_if: "changesInclude('.cirrus.yml', 'DEPS', 'lib/web_ui/**', 'web_sdk/**') || $CIRRUS_PR == ''"
   environment:
     # As of March 2020, the Web shards needed 16G of RAM and 4 CPUs to run all framework tests with goldens without flaking.
+    WEB_SHARD_COUNT: 12
     CPU: 4
     MEMORY: 16G
-    WEB_SHARD_COUNT: 4
+    CHROME_NO_SANDBOX: true
+    GOLD_SERVICE_ACCOUNT: ENCRYPTED[3afeea5ac7201151c3d0dc9648862f0462b5e4f55dc600ca8b692319622f7c3eda3d577b1b16cc2ef0311b7314c1c095]
   compile_host_script: |
     cd $ENGINE_PATH/src
     ./flutter/tools/gn --unoptimized --full-dart-sdk
@@ -108,7 +110,31 @@ task:
     - name: web_tests-2-linux
       << : *WEB_SHARD_TEMPLATE
 
-    - name: web_tests-3_last-linux # last Web shard must end with _last
+    - name: web_tests-3-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-4-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-5-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-6-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-7-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-8-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-9-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-10-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-11_last-linux # last Web shard must end with _last
       << : *WEB_SHARD_TEMPLATE
 
     - name: build_test

From 4124e8d977544c1dee87528c4c674227ec888d56 Mon Sep 17 00:00:00 2001
From: nturgut <nurhan@google.com>
Date: Thu, 30 Jul 2020 16:44:37 -0700
Subject: [PATCH 2/3] remove golden arguments. tests failed

---
 .cirrus.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 92702cb0326be..d81dec2a4732b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -8,7 +8,6 @@ web_shard_template: &WEB_SHARD_TEMPLATE
     CPU: 4
     MEMORY: 16G
     CHROME_NO_SANDBOX: true
-    GOLD_SERVICE_ACCOUNT: ENCRYPTED[3afeea5ac7201151c3d0dc9648862f0462b5e4f55dc600ca8b692319622f7c3eda3d577b1b16cc2ef0311b7314c1c095]
   compile_host_script: |
     cd $ENGINE_PATH/src
     ./flutter/tools/gn --unoptimized --full-dart-sdk

From 1c1010267d6f373e08179d10822516db6089cf2b Mon Sep 17 00:00:00 2001
From: nturgut <nurhan@google.com>
Date: Fri, 31 Jul 2020 10:05:07 -0700
Subject: [PATCH 3/3] adding comments

---
 .cirrus.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index d81dec2a4732b..a4b293029353f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -4,6 +4,8 @@ web_shard_template: &WEB_SHARD_TEMPLATE
   only_if: "changesInclude('.cirrus.yml', 'DEPS', 'lib/web_ui/**', 'web_sdk/**') || $CIRRUS_PR == ''"
   environment:
     # As of March 2020, the Web shards needed 16G of RAM and 4 CPUs to run all framework tests with goldens without flaking.
+    # The tests are encountering a flake in Chrome. Increasing the number of shards to decrease race conditions.
+    # https://github.com/flutter/flutter/issues/62510
     WEB_SHARD_COUNT: 12
     CPU: 4
     MEMORY: 16G