Adding the channel property to env for packages recipe.

Bug:https://github.com/flutter/flutter/issues/130071
Change-Id: Ibdff947496e0c4767ecde86bc1cb867d647a0005
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/46900
Reviewed-by: Keyong Han <keyonghan@google.com>
Commit-Queue: Yusuf Mohsinally <mohsinally@google.com>

recipe_modules/repo_util/api.py

diff --git a/recipe_modules/repo_util/api.py b/recipe_modules/repo_util/api.py
index b676d3a..6960cc7 100644
--- a/recipe_modules/repo_util/api.py
+++ b/recipe_modules/repo_util/api.py
@@ -402,6 +402,9 @@
         'REVISION':
             self.get_commit(checkout_path)
     }
+    channel = self.m.properties.get('channel', None)
+    if channel:
+      env['CHANNEL'] = channel
     package_sharding = self.m.properties.get('package_sharding', None)
     if package_sharding:
       env['PACKAGE_SHARDING'] = package_sharding

recipe_modules/repo_util/examples/full.py

diff --git a/recipe_modules/repo_util/examples/full.py b/recipe_modules/repo_util/examples/full.py
index ff8f600..8a60a76 100644
--- a/recipe_modules/repo_util/examples/full.py
+++ b/recipe_modules/repo_util/examples/full.py
@@ -64,6 +64,7 @@
               git_ref='refs/pull/1/head',
               clobber=True,
               package_sharding='shard1',
+              channel='stable',
           ), api.repo_util.flutter_environment_data(),
           api.step_data(
               'Identify branches.git rev-parse',

recipes/packages/packages.expected/mac.json

diff --git a/recipes/packages/packages.expected/mac.json b/recipes/packages/packages.expected/mac.json
index 77010e1..fac93f4 100644
--- a/recipes/packages/packages.expected/mac.json
+++ b/recipes/packages/packages.expected/mac.json
@@ -288,6 +288,7 @@
     ],
     "cwd": "[START_DIR]/flutter",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -317,6 +318,7 @@
     ],
     "cwd": "[START_DIR]/flutter",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -419,6 +421,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -456,6 +459,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -489,6 +493,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -537,6 +542,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -575,6 +581,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -622,6 +629,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",

recipes/packages/packages.expected/master_channel.json

diff --git a/recipes/packages/packages.expected/master_channel.json b/recipes/packages/packages.expected/master_channel.json
index 7ddb2af..2a85ba7 100644
--- a/recipes/packages/packages.expected/master_channel.json
+++ b/recipes/packages/packages.expected/master_channel.json
@@ -288,6 +288,7 @@
     ],
     "cwd": "[START_DIR]/flutter",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -317,6 +318,7 @@
     ],
     "cwd": "[START_DIR]/flutter",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -419,6 +421,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -454,6 +457,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -485,6 +489,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -531,6 +536,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -567,6 +573,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -612,6 +619,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",

recipes/packages/packages.expected/multiple_tests_with_always.json

diff --git a/recipes/packages/packages.expected/multiple_tests_with_always.json b/recipes/packages/packages.expected/multiple_tests_with_always.json
index 68444d4..6cb86fc 100644
--- a/recipes/packages/packages.expected/multiple_tests_with_always.json
+++ b/recipes/packages/packages.expected/multiple_tests_with_always.json
@@ -288,6 +288,7 @@
     ],
     "cwd": "[START_DIR]/flutter",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -317,6 +318,7 @@
     ],
     "cwd": "[START_DIR]/flutter",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -431,6 +433,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -466,6 +469,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -497,6 +501,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -544,6 +549,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -580,6 +586,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -625,6 +632,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -670,6 +678,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -705,6 +714,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -736,6 +746,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -782,6 +793,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -818,6 +830,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -863,6 +876,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "master",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",

recipes/packages/packages.expected/stable_channel.json

diff --git a/recipes/packages/packages.expected/stable_channel.json b/recipes/packages/packages.expected/stable_channel.json
index 4308819..6037037 100644
--- a/recipes/packages/packages.expected/stable_channel.json
+++ b/recipes/packages/packages.expected/stable_channel.json
@@ -269,6 +269,7 @@
     ],
     "cwd": "[START_DIR]/flutter",
     "env": {
+      "CHANNEL": "stable",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -298,6 +299,7 @@
     ],
     "cwd": "[START_DIR]/flutter",
     "env": {
+      "CHANNEL": "stable",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -400,6 +402,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "stable",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -435,6 +438,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "stable",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -466,6 +470,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "stable",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
       "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -512,6 +517,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "stable",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -548,6 +554,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "stable",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
@@ -593,6 +600,7 @@
     ],
     "cwd": "[START_DIR]/packages",
     "env": {
+      "CHANNEL": "stable",
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",