commit 08457a84749c33e863241142c046381ddc611811
author Keyong Han <keyonghan@google.com> Thu Mar 31 20:02:47 2022 +0000
committer CQ Bot Account <flutter-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Mar 31 20:02:47 2022 +0000
tree 29bbcf47949dd8fd918c89363e8eb2ab889d4e49
parent 798d64d8ff65e7c451651045ea0fef618ceb46de

Add xcode property.

This is a follow up of https://flutter-review.googlesource.com/c/infra/+/28421. Missing xcode version causes recipe failure (https://ci.chromium.org/ui/p/flutter/builders/staging/Mac_arm64_staging%20macos_chrome_dev_mode/466/overview).

Change-Id: I2acaed48ade1ea407a94a5c5a3baf5accc6b7bd4
Bug: https://github.com/flutter/flutter/issues/100639
Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/28540
Reviewed-by: Jenn Magder <magder@google.com>
Commit-Queue: Keyong Han <keyonghan@google.com>

config/devicelab_staging_config.star

diff --git a/config/devicelab_staging_config.star b/config/devicelab_staging_config.star
index 8c2bb9d..1725489 100644
--- a/config/devicelab_staging_config.star
+++ b/config/devicelab_staging_config.star
@@ -336,6 +336,9 @@
             triggered_by = [trigger_name],
             triggering_policy = triggering_policy,
             properties = {
+                "$flutter/devicelab_osx_sdk": {
+                    "sdk_version": XCODE_VERSION,
+                },
                 "dependencies": [
                     {
                         "dependency": "xcode",
@@ -352,9 +355,6 @@
                 "git_branch": DEFAULT_BRANCH,
                 "use_cas": True,
                 "upload_metrics": True,
-                "$flutter/osx_sdk": {
-                    "sdk_version": XCODE_VERSION,
-                },
             },
             category = "Mac_arm64",
             bucket = "staging",

config/generated/flutter/luci/cr-buildbucket.cfg

diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index 7526da9..a771f70 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -191042,7 +191042,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
@@ -191127,7 +191127,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
@@ -191212,7 +191212,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
@@ -191297,7 +191297,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
@@ -191382,7 +191382,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
@@ -191467,7 +191467,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
@@ -191552,7 +191552,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
@@ -191637,7 +191637,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
@@ -191722,7 +191722,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
@@ -191807,7 +191807,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
@@ -191892,7 +191892,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
@@ -191977,7 +191977,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
@@ -192062,7 +192062,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
@@ -192147,7 +192147,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'
@@ -192232,7 +192232,7 @@
       }
       properties:
         '{'
-        '  "$flutter/osx_sdk": {'
+        '  "$flutter/devicelab_osx_sdk": {'
         '    "sdk_version": "13a233"'
         '  },'
         '  "$fuchsia/goma": {'

config/generated/flutter/luci/project.cfg

diff --git a/config/generated/flutter/luci/project.cfg b/config/generated/flutter/luci/project.cfg
index 61da59d..1b70f14 100644
--- a/config/generated/flutter/luci/project.cfg
+++ b/config/generated/flutter/luci/project.cfg
@@ -7,7 +7,7 @@
 name: "flutter"
 access: "group:all"
 lucicfg {
-  version: "1.30.11"
+  version: "1.30.10"
   package_dir: "../../.."
   config_dir: "generated/flutter/luci"
   entry_point: "main.star"