From 01cfee2e1fafd084b98f487bcc0f493fc9537e72 Mon Sep 17 00:00:00 2001
From: Keyong Han <keyonghan@google.com>
Date: Wed, 20 Dec 2023 10:41:58 -0800
Subject: [PATCH] add env_variables

---
 .ci.yaml | 427 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 425 insertions(+), 2 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index 0bb2ae374846..256d2fe096a0 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -122,6 +122,10 @@ targets:
       target_file: repo_tools_tests.yaml
       channel: master
       version_file: flutter_master.version
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Linux repo_checks
     recipe: packages/packages
@@ -137,6 +141,10 @@ targets:
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "open_jdk", "version": "version:17"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Linux dart_unit_test_shard_1 master
     recipe: packages/packages
@@ -147,6 +155,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 0 --shardCount 2"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
+        }
 
   - name: Linux dart_unit_test_shard_2 master
     recipe: packages/packages
@@ -157,6 +170,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 1 --shardCount 2"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
+        }
 
   - name: Linux dart_unit_test_shard_1 stable
     recipe: packages/packages
@@ -166,6 +184,11 @@ targets:
       channel: stable
       version_file: flutter_stable.version
       package_sharding: "--shardIndex 0 --shardCount 2"
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
+        }
 
   - name: Linux dart_unit_test_shard_2 stable
     recipe: packages/packages
@@ -175,6 +198,11 @@ targets:
       channel: stable
       version_file: flutter_stable.version
       package_sharding: "--shardIndex 1 --shardCount 2"
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
+        }
 
   - name: Linux_web web_dart_unit_test_shard_1 master
     recipe: packages/packages
@@ -185,6 +213,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 0 --shardCount 2"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
+        }
 
   - name: Linux_web web_dart_unit_test_shard_2 master
     recipe: packages/packages
@@ -195,6 +228,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 1 --shardCount 2"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
+        }
 
   - name: Linux_web web_dart_unit_test_shard_1 stable
     recipe: packages/packages
@@ -204,6 +242,11 @@ targets:
       channel: stable
       version_file: flutter_stable.version
       package_sharding: "--shardIndex 0 --shardCount 2"
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
+        }
 
   - name: Linux_web web_dart_unit_test_shard_2 stable
     recipe: packages/packages
@@ -213,6 +256,11 @@ targets:
       channel: stable
       version_file: flutter_stable.version
       package_sharding: "--shardIndex 1 --shardCount 2"
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
+        }
 
   - name: Linux analyze master
     recipe: packages/packages
@@ -222,6 +270,10 @@ targets:
       target_file: analyze.yaml
       channel: master
       version_file: flutter_master.version
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Linux analyze stable
     recipe: packages/packages
@@ -230,6 +282,10 @@ targets:
       target_file: analyze.yaml
       channel: stable
       version_file: flutter_stable.version
+      env_variables: >-
+        {
+          "CHANNEL": "stable"
+        }
 
   - name: Linux analyze_downgraded master
     recipe: packages/packages
@@ -239,6 +295,10 @@ targets:
       target_file: analyze_downgraded.yaml
       channel: master
       version_file: flutter_master.version
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Linux analyze_downgraded stable
     recipe: packages/packages
@@ -247,6 +307,10 @@ targets:
       target_file: analyze_downgraded.yaml
       channel: stable
       version_file: flutter_stable.version
+      env_variables: >-
+        {
+          "CHANNEL": "stable"
+        }
 
   # Analyze with the previous stable (N-1) and the stable before that (N-2). The
   # versions in `channel` should be updated after a new major stable release.
@@ -256,6 +320,10 @@ targets:
     properties:
       target_file: analyze_legacy.yaml
       channel: "3.13.9"
+      env_variables: >-
+        {
+          "CHANNEL": "3.13.9"
+        }
 
   - name: Linux analyze_legacy N-2
     recipe: packages/packages
@@ -263,6 +331,10 @@ targets:
     properties:
       target_file: analyze_legacy.yaml
       channel: "3.10.6"
+      env_variables: >-
+        {
+          "CHANNEL": "3.10.6"
+        }
 
   - name: Linux_android custom_package_tests master
     recipe: packages/packages
@@ -283,6 +355,10 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:114.0"}
         ]
       channel: master
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Linux_android custom_package_tests stable
     recipe: packages/packages
@@ -300,6 +376,10 @@ targets:
           {"dependency": "chrome_and_driver", "version": "version:114.0"}
         ]
       channel: stable
+      env_variables: >-
+        {
+          "CHANNEL": "stable"
+        }
 
   ### Android tasks ###
   - name: Linux_android android_build_all_packages master
@@ -315,6 +395,10 @@ targets:
         [
           {"dependency": "open_jdk", "version": "version:11"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Linux_android android_build_all_packages stable
     recipe: packages/packages
@@ -329,6 +413,10 @@ targets:
         [
           {"dependency": "open_jdk", "version": "version:11"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "stable"
+        }
 
   # All of the Linux_android android_platform_tests shards have the same
   # dependency list, despite some running on Android 33 AVDs versus 34.
@@ -346,6 +434,11 @@ targets:
         [
           {"dependency": "android_virtual_device", "version": "34"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 6"
+        }
 
   - name: Linux_android android_platform_tests_shard_2 master
     recipe: packages/packages
@@ -360,6 +453,11 @@ targets:
         [
           {"dependency": "android_virtual_device", "version": "34"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 6"
+        }
 
   - name: Linux_android android_platform_tests_shard_3 master
     recipe: packages/packages
@@ -374,6 +472,11 @@ targets:
         [
           {"dependency": "android_virtual_device", "version": "34"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 2 --shardCount 6"
+        }
 
   - name: Linux_android android_platform_tests_shard_4 master
     recipe: packages/packages
@@ -388,6 +491,11 @@ targets:
         [
           {"dependency": "android_virtual_device", "version": "34"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 3 --shardCount 6"
+        }
 
   - name: Linux_android android_platform_tests_shard_5 master
     recipe: packages/packages
@@ -402,6 +510,11 @@ targets:
         [
           {"dependency": "android_virtual_device", "version": "34"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 4 --shardCount 6"
+        }
 
   - name: Linux_android android_platform_tests_shard_6 master
     recipe: packages/packages
@@ -416,6 +529,11 @@ targets:
         [
           {"dependency": "android_virtual_device", "version": "34"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 5 --shardCount 6"
+        }
 
   - name: Linux_android android_platform_tests_api_33_shard_1 master
     recipe: packages/packages
@@ -430,6 +548,11 @@ targets:
         [
           {"dependency": "android_virtual_device", "version": "33"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
+        }
 
   - name: Linux_android android_platform_tests_api_33_shard_2 master
     recipe: packages/packages
@@ -444,6 +567,11 @@ targets:
         [
           {"dependency": "android_virtual_device", "version": "33"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
+        }
 
   - name: Linux_android android_platform_tests_shard_1 stable
     recipe: packages/packages
@@ -458,6 +586,11 @@ targets:
         [
           {"dependency": "android_virtual_device", "version": "34"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 6"
+        }
 
   - name: Linux_android android_platform_tests_shard_2 stable
     recipe: packages/packages
@@ -472,6 +605,11 @@ targets:
         [
           {"dependency": "android_virtual_device", "version": "34"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 6"
+        }
 
   - name: Linux_android android_platform_tests_shard_3 stable
     recipe: packages/packages
@@ -486,6 +624,11 @@ targets:
         [
           {"dependency": "android_virtual_device", "version": "34"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 2 --shardCount 6"
+        }
 
   - name: Linux_android android_platform_tests_shard_4 stable
     recipe: packages/packages
@@ -500,6 +643,11 @@ targets:
         [
           {"dependency": "android_virtual_device", "version": "34"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 3 --shardCount 6"
+        }
 
   - name: Linux_android android_platform_tests_shard_5 stable
     recipe: packages/packages
@@ -514,6 +662,11 @@ targets:
         [
           {"dependency": "android_virtual_device", "version": "34"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 4 --shardCount 6"
+        }
 
   - name: Linux_android android_platform_tests_shard_6 stable
     recipe: packages/packages
@@ -528,32 +681,47 @@ targets:
         [
           {"dependency": "android_virtual_device", "version": "34"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 5 --shardCount 6"
+        }
 
   - name: Linux_android android_platform_tests_api_33_shard_1 stable
     recipe: packages/packages
     timeout: 60
     properties:
       target_file: android_platform_tests_api_33_avd.yaml
-      channel: master
+      channel: stable
       version_file: flutter_stable.version
       package_sharding: "--shardIndex 0 --shardCount 2"
       dependencies: >-
         [
           {"dependency": "android_virtual_device", "version": "33"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
+        }
 
   - name: Linux_android android_platform_tests_api_33_shard_2 stable
     recipe: packages/packages
     timeout: 60
     properties:
       target_file: android_platform_tests_api_33_avd.yaml
-      channel: master
+      channel: stable
       version_file: flutter_stable.version
       package_sharding: "--shardIndex 1 --shardCount 2"
       dependencies: >-
         [
           {"dependency": "android_virtual_device", "version": "33"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
+        }
 
   - name: Linux_android_legacy android_platform_tests_legacy_api_shard_1 master
     recipe: packages/packages
@@ -563,6 +731,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 0 --shardCount 6"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 6"
+        }
 
   - name: Linux_android_legacy android_platform_tests_legacy_api_shard_2 master
     recipe: packages/packages
@@ -572,6 +745,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 1 --shardCount 6"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 6"
+        }
 
   - name: Linux_android_legacy android_platform_tests_legacy_api_shard_3 master
     recipe: packages/packages
@@ -581,6 +759,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 2 --shardCount 6"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 2 --shardCount 6"
+        }
 
   - name: Linux_android_legacy android_platform_tests_legacy_api_shard_4 master
     recipe: packages/packages
@@ -590,6 +773,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 3 --shardCount 6"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 3 --shardCount 6"
+        }
 
   - name: Linux_android_legacy android_platform_tests_legacy_api_shard_5 master
     recipe: packages/packages
@@ -599,6 +787,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 4 --shardCount 6"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 4 --shardCount 6"
+        }
 
   - name: Linux_android_legacy android_platform_tests_legacy_api_shard_6 master
     recipe: packages/packages
@@ -608,6 +801,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 5 --shardCount 6"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 5 --shardCount 6"
+        }
 
   # Device versions of Android integration tests, run via FTL.
   # TODO(stuartmorgan): Revisit whether physical device tests are redundant once
@@ -622,6 +820,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 0 --shardCount 6"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 6"
+        }
 
   - name: Linux_android android_device_tests_shard_2 master
     recipe: packages/packages
@@ -631,6 +834,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 1 --shardCount 6"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 6"
+        }
 
   - name: Linux_android android_device_tests_shard_3 master
     recipe: packages/packages
@@ -640,6 +848,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 2 --shardCount 6"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 2 --shardCount 6"
+        }
 
   - name: Linux_android android_device_tests_shard_4 master
     recipe: packages/packages
@@ -649,6 +862,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 3 --shardCount 6"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 3 --shardCount 6"
+        }
 
   - name: Linux_android android_device_tests_shard_5 master
     recipe: packages/packages
@@ -658,6 +876,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 4 --shardCount 6"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 4 --shardCount 6"
+        }
 
   - name: Linux_android android_device_tests_shard_6 master
     recipe: packages/packages
@@ -667,6 +890,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 5 --shardCount 6"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 5 --shardCount 6"
+        }
 
   ### Web tasks ###
   - name: Linux_web web_build_all_packages master
@@ -677,6 +905,10 @@ targets:
       version_file: flutter_master.version
       target_file: web_build_all_packages.yaml
       channel: master
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Linux_web web_build_all_packages stable
     recipe: packages/packages
@@ -685,6 +917,10 @@ targets:
       version_file: flutter_stable.version
       target_file: web_build_all_packages.yaml
       channel: stable
+      env_variables: >-
+        {
+          "CHANNEL": "stable"
+        }
 
   - name: Linux_web web_platform_tests_shard_1 master
     recipe: packages/packages
@@ -694,6 +930,11 @@ targets:
       version_file: flutter_master.version
       channel: master
       package_sharding: "--shardIndex 0 --shardCount 3"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 3"
+        }
 
   - name: Linux_web web_platform_tests_shard_2 master
     recipe: packages/packages
@@ -703,6 +944,11 @@ targets:
       version_file: flutter_master.version
       channel: master
       package_sharding: "--shardIndex 1 --shardCount 3"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 3"
+        }
 
   - name: Linux_web web_platform_tests_shard_3 master
     recipe: packages/packages
@@ -712,6 +958,11 @@ targets:
       version_file: flutter_master.version
       channel: master
       package_sharding: "--shardIndex 2 --shardCount 3"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 2 --shardCount 3"
+        }
 
   - name: Linux_web web_platform_tests_shard_1 stable
     recipe: packages/packages
@@ -721,6 +972,11 @@ targets:
       version_file: flutter_stable.version
       channel: stable
       package_sharding: "--shardIndex 0 --shardCount 3"
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 3"
+        }
 
   - name: Linux_web web_platform_tests_shard_2 stable
     recipe: packages/packages
@@ -730,6 +986,11 @@ targets:
       version_file: flutter_stable.version
       channel: stable
       package_sharding: "--shardIndex 1 --shardCount 3"
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 3"
+        }
 
   - name: Linux_web web_platform_tests_shard_3 stable
     recipe: packages/packages
@@ -739,6 +1000,11 @@ targets:
       version_file: flutter_stable.version
       channel: stable
       package_sharding: "--shardIndex 2 --shardCount 3"
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 2 --shardCount 3"
+        }
 
   ### Linux desktop tasks
   - name: Linux_desktop build_all_packages master
@@ -749,6 +1015,10 @@ targets:
       version_file: flutter_master.version
       target_file: linux_build_all_packages.yaml
       channel: master
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Linux_desktop build_all_packages stable
     recipe: packages/packages
@@ -757,6 +1027,10 @@ targets:
       version_file: flutter_stable.version
       target_file: linux_build_all_packages.yaml
       channel: stable
+      env_variables: >-
+        {
+          "CHANNEL": "stable"
+        }
 
   - name: Linux_desktop platform_tests master
     recipe: packages/packages
@@ -770,6 +1044,10 @@ targets:
         [
           {"dependency": "chrome_and_driver", "version": "version:114.0"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Linux_desktop platform_tests stable
     recipe: packages/packages
@@ -784,6 +1062,10 @@ targets:
         [
           {"dependency": "chrome_and_driver", "version": "version:114.0"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "stable"
+        }
 
   ### iOS+macOS tasks ###
   # TODO(stuartmorgan): Move this to ARM once google_maps_flutter has ARM
@@ -808,6 +1090,10 @@ targets:
       version_file: flutter_master.version
       target_file: macos_build_all_packages.yaml
       channel: master
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Mac_x64 build_all_packages stable
     recipe: packages/packages
@@ -817,6 +1103,10 @@ targets:
       version_file: flutter_stable.version
       target_file: macos_build_all_packages.yaml
       channel: stable
+      env_variables: >-
+        {
+          "CHANNEL": "stable"
+        }
 
   # TODO(stuartmorgan): Remove "- packages" from all task names once
   # flutter/plugins is merged into this repo and turned down; it's here only
@@ -829,6 +1119,10 @@ targets:
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: macos_platform_tests.yaml
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Mac_arm64 macos_platform_tests stable - packages
     recipe: packages/packages
@@ -839,6 +1133,10 @@ targets:
       add_recipes_cq: "true"
       version_file: flutter_stable.version
       target_file: macos_platform_tests.yaml
+      env_variables: >-
+        {
+          "CHANNEL": "stable"
+        }
 
   - name: Mac_arm64 custom_package_tests master
     recipe: packages/packages
@@ -848,6 +1146,10 @@ targets:
       version_file: flutter_master.version
       target_file: macos_custom_package_tests.yaml
       channel: master
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Mac_arm64 custom_package_tests stable
     recipe: packages/packages
@@ -857,6 +1159,10 @@ targets:
       version_file: flutter_stable.version
       target_file: macos_custom_package_tests.yaml
       channel: stable
+      env_variables: >-
+        {
+          "CHANNEL": "stable"
+        }
 
   ### iOS tasks ###
   # ios_platform_tests builds all the packages on ARM, so this build is run
@@ -869,6 +1175,10 @@ targets:
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_build_all_packages.yaml
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Mac_x64 ios_build_all_packages stable
     recipe: packages/packages
@@ -878,51 +1188,85 @@ targets:
       add_recipes_cq: "true"
       version_file: flutter_stable.version
       target_file: ios_build_all_packages.yaml
+      env_variables: >-
+        {
+          "CHANNEL": "stable"
+        }
 
   - name: Mac_arm64 ios_platform_tests_shard_1 master
     recipe: packages/packages
     timeout: 60
     properties:
+      channel: master
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 0 --shardCount 5"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 5"
+        }
 
   - name: Mac_arm64 ios_platform_tests_shard_2 master
     recipe: packages/packages
     timeout: 60
     properties:
+      channel: master
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 1 --shardCount 5"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 5"
+        }
 
   - name: Mac_arm64 ios_platform_tests_shard_3 master
     recipe: packages/packages
     timeout: 60
     properties:
+      channel: master
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 2 --shardCount 5"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 2 --shardCount 5"
+        }
 
   - name: Mac_arm64 ios_platform_tests_shard_4 master
     recipe: packages/packages
     timeout: 60
     properties:
+      channel: master
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 3 --shardCount 5"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 3 --shardCount 5"
+        }
 
   - name: Mac_arm64 ios_platform_tests_shard_5 master
     recipe: packages/packages
     timeout: 60
     properties:
+      channel: master
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 4 --shardCount 5"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 4 --shardCount 5"
+        }
 
   # Don't run full platform tests on both channels in pre-submit.
   - name: Mac_arm64 ios_platform_tests_shard_1 stable
@@ -935,6 +1279,11 @@ targets:
       version_file: flutter_stable.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 0 --shardCount 5"
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 5"
+        }
 
   - name: Mac_arm64 ios_platform_tests_shard_2 stable
     recipe: packages/packages
@@ -946,6 +1295,11 @@ targets:
       version_file: flutter_stable.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 1 --shardCount 5"
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 5"
+        }
 
   - name: Mac_arm64 ios_platform_tests_shard_3 stable
     recipe: packages/packages
@@ -957,6 +1311,11 @@ targets:
       version_file: flutter_stable.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 2 --shardCount 5"
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 2 --shardCount 5"
+        }
 
   - name: Mac_arm64 ios_platform_tests_shard_4 stable
     recipe: packages/packages
@@ -968,6 +1327,11 @@ targets:
       version_file: flutter_stable.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 3 --shardCount 5"
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 3 --shardCount 5"
+        }
 
   - name: Mac_arm64 ios_platform_tests_shard_5 stable
     recipe: packages/packages
@@ -979,6 +1343,11 @@ targets:
       version_file: flutter_stable.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 4 --shardCount 5"
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 4 --shardCount 5"
+        }
 
   ### Windows desktop tasks ###
   - name: Windows_x64 custom_package_tests master - packages
@@ -993,6 +1362,10 @@ targets:
         [
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Windows_x64 dart_unit_tests_shard_1 master
     recipe: packages/packages
@@ -1002,6 +1375,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 0 --shardCount 2"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
+        }
 
   - name: Windows_x64 dart_unit_tests_shard_2 master
     recipe: packages/packages
@@ -1011,6 +1389,11 @@ targets:
       channel: master
       version_file: flutter_master.version
       package_sharding: "--shardIndex 1 --shardCount 2"
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
+        }
 
   - name: Windows_x64 win32-platform_tests_shard_1 master
     recipe: packages/packages
@@ -1025,6 +1408,11 @@ targets:
         [
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
+        }
 
   - name: Windows_x64 win32-platform_tests_shard_2 master
     recipe: packages/packages
@@ -1039,6 +1427,11 @@ targets:
         [
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
+        }
 
   - name: Windows_x64 win32-platform_tests_shard_1 stable
     recipe: packages/packages
@@ -1053,6 +1446,11 @@ targets:
         [
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
+        }
 
   - name: Windows_x64 win32-platform_tests_shard_2 stable
     recipe: packages/packages
@@ -1067,6 +1465,11 @@ targets:
         [
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "stable",
+          "PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
+        }
 
   - name: Windows_x64 windows-build_all_packages master
     recipe: packages/packages
@@ -1080,6 +1483,10 @@ targets:
         [
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Windows_arm64 windows-build_all_packages master
     recipe: packages/packages
@@ -1094,6 +1501,10 @@ targets:
         [
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Windows_x64 windows-build_all_packages stable
     recipe: packages/packages
@@ -1106,6 +1517,10 @@ targets:
         [
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "stable"
+        }
 
   - name: Windows_arm64 windows-build_all_packages stable
     recipe: packages/packages
@@ -1120,6 +1535,10 @@ targets:
         [
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
+      env_variables: >-
+        {
+          "CHANNEL": "stable"
+        }
 
   - name: Windows_x64 repo_tools_tests
     recipe: packages/packages
@@ -1129,6 +1548,10 @@ targets:
       target_file: repo_tools_tests.yaml
       channel: master
       version_file: flutter_master.version
+      env_variables: >-
+        {
+          "CHANNEL": "master"
+        }
 
   - name: Linux ci_yaml packages roller
     recipe: infra/ci_yaml