Promote S6 Job to CQ, demote N5 Job to experimental

Galaxy S6 was way quicker on average: 19 min vs 33 min
https://docs.google.com/spreadsheets/d/1tO1YA3RL36FBGgrfpV-cr1v9srFMowBtlwywSG0frYI/edit#gid=0

We'll only keep the Nexus 5 on for a few weeks, in case we decide to go back.

Bug: skia:
NOTRY=true
Change-Id: I36cc617d4ea274bfaf5b54e9c6d73715d40d65a8

Change-Id: I36cc617d4ea274bfaf5b54e9c6d73715d40d65a8
Reviewed-on: https://skia-review.googlesource.com/13982
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>

diff --git a/infra/branch-config/cq.cfg b/infra/branch-config/cq.cfg
index c534d2c..ae5212d 100644 (file)
--- a/infra/branch-config/cq.cfg
+++ b/infra/branch-config/cq.cfg
@@ -54,11 +54,11 @@ verifiers {
       builders { name: "Build-Win-MSVC-x86-Debug" }
       builders { name: "Build-Win-MSVC-x86_64-Release-Vulkan" }
       builders { name: "Housekeeper-PerCommit-InfraTests" }
+      builders { name: "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android" }
       builders {
-        name: "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android"
+        name: "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android"
         experiment_percentage: 100
       }
-      builders { name: "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android" }
       builders { name: "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug" }
       builders { name: "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release" }
       builders { name: "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release" }