From 6bc75c8b08b054889873afc5b40e1a0562b3ef6b Mon Sep 17 00:00:00 2001
From: stuartmorgan <stuartmorgan@google.com>
Date: Thu, 6 Jul 2023 15:01:11 -0400
Subject: [PATCH] [ci] Switch `master` Linux custom package tests to LUCI
 (#4386)

Enables the new LUCI target for `master`, and removes the Cirrus version.

I only pre-tested `master`, and it turns out that `stable` is blocked by https://github.com/flutter/flutter/issues/130071.

Part of https://github.com/flutter/flutter/issues/114373
---
 .ci.yaml    | 3 +--
 .cirrus.yml | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index 9c6bf0ab77ce..cdd848ddc92b 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -211,7 +211,6 @@ targets:
       version_file: flutter_stable.version
 
   - name: Linux_android custom_package_tests master
-    bringup: true # New target
     recipe: packages/packages
     timeout: 30
     properties:
@@ -228,7 +227,7 @@ targets:
       channel: master
 
   - name: Linux_android custom_package_tests stable
-    bringup: true # New target
+    bringup: true # Blocked on https://github.com/flutter/flutter/issues/130071
     recipe: packages/packages
     timeout: 30
     properties:
diff --git a/.cirrus.yml b/.cirrus.yml
index 69f388dad878..b995936fdc05 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -161,9 +161,9 @@ task:
     - name: linux-custom_package_tests
       env:
         PATH: $PATH:/usr/local/bin
-        matrix:
-          CHANNEL: "master"
-          CHANNEL: "stable"
+        # Master has been migrated to LUCI, but stable is blocked on
+        # https://github.com/flutter/flutter/issues/130071
+        CHANNEL: "stable"
       << : *INSTALL_CHROME_LINUX
       local_tests_script:
         - ./script/tool_runner.sh custom-test