commit 215c429521976c903835a148ade3d7dca7ea2264
author Keyong Han <keyonghan@google.com> Fri Aug 07 18:51:41 2020 +0000
committer CQ Bot Account <flutter-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Aug 07 18:51:41 2020 +0000
tree 03eacb0a4f7ab778415d53dfc6b129291c942d2a
parent 6da01e1bcf18d05b509eb048bbd460320f87899c

Luci builder configs have now been available in separate repos. This CL enables validation of the config json file format for packages recipe.

Change-Id: Ie4ffbac6a80a473b67525ba49a96513669d73d9f
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/5281
Reviewed-by: Tong Wu <wutong@google.com>
Commit-Queue: Keyong Han <keyonghan@google.com>

recipes/fuchsia_ctl.expected/demo.json

diff --git a/recipes/fuchsia_ctl.expected/demo.json b/recipes/fuchsia_ctl.expected/demo.json
index cb524e4..4cabadc 100644
--- a/recipes/fuchsia_ctl.expected/demo.json
+++ b/recipes/fuchsia_ctl.expected/demo.json
@@ -89,6 +89,24 @@
   },
   {
     "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[START_DIR]/packages/dev/try_builders.json",
+      "/path/to/tmp/"
+    ],
+    "infra_step": true,
+    "name": "validate try json format",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@try_builders.json@\"\"@@@",
+      "@@@STEP_LOG_END@try_builders.json@@@"
+    ]
+  },
+  {
+    "cmd": [
       "tool/build.sh"
     ],
     "cwd": "[START_DIR]/packages/packages/fuchsia_ctl",

recipes/fuchsia_ctl.py

diff --git a/recipes/fuchsia_ctl.py b/recipes/fuchsia_ctl.py
index 3f4f413..4694af6 100644
--- a/recipes/fuchsia_ctl.py
+++ b/recipes/fuchsia_ctl.py
@@ -17,6 +17,7 @@
     'recipe_engine/properties',
     'recipe_engine/step',
     'recipe_engine/swarming',
+    'flutter/json_util',
     'repo_util',
     'yaml',
 ]
@@ -32,6 +33,8 @@
       api.properties.get('git_url'),
       api.properties.get('git_ref'),
   )
+  # Validates packages builders json format.
+  api.json_util.validate_json(packages_dir, 'packages')
 
   # Build and uploads a new version of the fuchsia_ctl CIPD package.
   fuchsia_ctl_path = packages_dir.join('packages', 'fuchsia_ctl')