From 40a227b22e8ae1e634f3936aa598683989abda67 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 6 Jul 2023 07:36:02 -0400 Subject: [PATCH 1/2] [ci] Switch Linux custom package tests to LUCI Enables the new LUCI targets, and removes the Cirrus version. Part of https://github.com/flutter/flutter/issues/114373 --- .ci.yaml | 2 -- .cirrus.yml | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index a08f72dfed59..8ba6a1aea124 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -215,7 +215,6 @@ targets: version_file: flutter_stable.version - name: Linux_android custom_package_tests master - bringup: true # New target recipe: packages/packages timeout: 30 properties: @@ -232,7 +231,6 @@ targets: channel: master - name: Linux_android custom_package_tests stable - bringup: true # New target recipe: packages/packages timeout: 30 properties: diff --git a/.cirrus.yml b/.cirrus.yml index 69f388dad878..7a259df6aa47 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -157,16 +157,6 @@ task: cpu: 4 memory: 16G matrix: - ### Platform-agnostic tasks ### - - name: linux-custom_package_tests - env: - PATH: $PATH:/usr/local/bin - matrix: - CHANNEL: "master" - CHANNEL: "stable" - << : *INSTALL_CHROME_LINUX - local_tests_script: - - ./script/tool_runner.sh custom-test ### Android tasks ### - name: android-platform_tests # Don't run full platform tests on both channels in pre-submit. From 7eb82e3deb47ea238429d9802e0b5eb931b2af9d Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 6 Jul 2023 10:07:12 -0400 Subject: [PATCH 2/2] Re-add stable --- .ci.yaml | 1 + .cirrus.yml | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/.ci.yaml b/.ci.yaml index 8ba6a1aea124..3f02252c7c5a 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -231,6 +231,7 @@ targets: channel: master - name: Linux_android custom_package_tests stable + 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 7a259df6aa47..b995936fdc05 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -157,6 +157,16 @@ task: cpu: 4 memory: 16G matrix: + ### Platform-agnostic tasks ### + - name: linux-custom_package_tests + env: + PATH: $PATH:/usr/local/bin + # 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 ### Android tasks ### - name: android-platform_tests # Don't run full platform tests on both channels in pre-submit.