Revert "Enable json validation for sdk"
This reverts commit 1b8ef645179ed48a032eb22b15983bb43660f202.
Reason for revert: Causing framework linux builder failure.
Original change's description:
> Enable json validation for sdk
>
> Luci builder configs have now been available in separate repos. This CL enables validation of the config json file format for flutter recipes.
>
> Change-Id: Ice879fe16cf47771c8ebb9450c1882154ebc9753
> Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/5340
> Commit-Queue: Keyong Han <keyonghan@google.com>
> Reviewed-by: Tong Wu <wutong@google.com>
TBR=wutong@google.com,godofredoc@google.com,keyonghan@google.com,flutter-scoped@luci-project-accounts.iam.gserviceaccount.com
Change-Id: I19b735399a04c9a9a83c742a51fc10de9b092f37
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/5422
Reviewed-by: Keyong Han <keyonghan@google.com>
Commit-Queue: Keyong Han <keyonghan@google.com>
diff --git a/recipes/flutter.expected/linux_beta.json b/recipes/flutter.expected/linux_beta.json
index c2fe30b..f4d348d 100644
--- a/recipes/flutter.expected/linux_beta.json
+++ b/recipes/flutter.expected/linux_beta.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_beta_experimental.json b/recipes/flutter.expected/linux_beta_experimental.json
index ef5f991..2d02efb 100644
--- a/recipes/flutter.expected/linux_beta_experimental.json
+++ b/recipes/flutter.expected/linux_beta_experimental.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_beta_experimental_upload.json b/recipes/flutter.expected/linux_beta_experimental_upload.json
index 91c9f4e..aea06ad 100644
--- a/recipes/flutter.expected/linux_beta_experimental_upload.json
+++ b/recipes/flutter.expected/linux_beta_experimental_upload.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_beta_upload.json b/recipes/flutter.expected/linux_beta_upload.json
index c392238..9d23a1c 100644
--- a/recipes/flutter.expected/linux_beta_upload.json
+++ b/recipes/flutter.expected/linux_beta_upload.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_dev.json b/recipes/flutter.expected/linux_dev.json
index 6ce869a..c74bc68 100644
--- a/recipes/flutter.expected/linux_dev.json
+++ b/recipes/flutter.expected/linux_dev.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_dev_experimental.json b/recipes/flutter.expected/linux_dev_experimental.json
index 7a5ef29..776267f 100644
--- a/recipes/flutter.expected/linux_dev_experimental.json
+++ b/recipes/flutter.expected/linux_dev_experimental.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_dev_experimental_upload.json b/recipes/flutter.expected/linux_dev_experimental_upload.json
index 3653bd8..970a0be 100644
--- a/recipes/flutter.expected/linux_dev_experimental_upload.json
+++ b/recipes/flutter.expected/linux_dev_experimental_upload.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_dev_upload.json b/recipes/flutter.expected/linux_dev_upload.json
index 4d1a8d7..c93758a 100644
--- a/recipes/flutter.expected/linux_dev_upload.json
+++ b/recipes/flutter.expected/linux_dev_upload.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_master.json b/recipes/flutter.expected/linux_master.json
index ce568f4..53d60d4 100644
--- a/recipes/flutter.expected/linux_master.json
+++ b/recipes/flutter.expected/linux_master.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_master_coverage_.json b/recipes/flutter.expected/linux_master_coverage_.json
index 2ad52b8..dc1047c 100644
--- a/recipes/flutter.expected/linux_master_coverage_.json
+++ b/recipes/flutter.expected/linux_master_coverage_.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_master_coverage__experimental.json b/recipes/flutter.expected/linux_master_coverage__experimental.json
index 2ad52b8..dc1047c 100644
--- a/recipes/flutter.expected/linux_master_coverage__experimental.json
+++ b/recipes/flutter.expected/linux_master_coverage__experimental.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_master_coverage__experimental_upload.json b/recipes/flutter.expected/linux_master_coverage__experimental_upload.json
index 1f2b2c8..0899b2f 100644
--- a/recipes/flutter.expected/linux_master_coverage__experimental_upload.json
+++ b/recipes/flutter.expected/linux_master_coverage__experimental_upload.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_master_coverage__upload.json b/recipes/flutter.expected/linux_master_coverage__upload.json
index 88a7c18..4a4baa3 100644
--- a/recipes/flutter.expected/linux_master_coverage__upload.json
+++ b/recipes/flutter.expected/linux_master_coverage__upload.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_master_experimental.json b/recipes/flutter.expected/linux_master_experimental.json
index ce568f4..53d60d4 100644
--- a/recipes/flutter.expected/linux_master_experimental.json
+++ b/recipes/flutter.expected/linux_master_experimental.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_master_experimental_upload.json b/recipes/flutter.expected/linux_master_experimental_upload.json
index 45d1b32..4034265 100644
--- a/recipes/flutter.expected/linux_master_experimental_upload.json
+++ b/recipes/flutter.expected/linux_master_experimental_upload.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_master_upload.json b/recipes/flutter.expected/linux_master_upload.json
index 45d1b32..4034265 100644
--- a/recipes/flutter.expected/linux_master_upload.json
+++ b/recipes/flutter.expected/linux_master_upload.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_stable.json b/recipes/flutter.expected/linux_stable.json
index e5c21fe..d6afc17 100644
--- a/recipes/flutter.expected/linux_stable.json
+++ b/recipes/flutter.expected/linux_stable.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_stable_experimental.json b/recipes/flutter.expected/linux_stable_experimental.json
index dac3038..c97d6eb 100644
--- a/recipes/flutter.expected/linux_stable_experimental.json
+++ b/recipes/flutter.expected/linux_stable_experimental.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_stable_experimental_upload.json b/recipes/flutter.expected/linux_stable_experimental_upload.json
index 3762254..8dee459 100644
--- a/recipes/flutter.expected/linux_stable_experimental_upload.json
+++ b/recipes/flutter.expected/linux_stable_experimental_upload.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/linux_stable_upload.json b/recipes/flutter.expected/linux_stable_upload.json
index 1334e68..2dbb045 100644
--- a/recipes/flutter.expected/linux_stable_upload.json
+++ b/recipes/flutter.expected/linux_stable_upload.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.expected/pull_request.json b/recipes/flutter.expected/pull_request.json
index 14f6d7b..3e6a70e 100644
--- a/recipes/flutter.expected/pull_request.json
+++ b/recipes/flutter.expected/pull_request.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Download goldctl"
},
diff --git a/recipes/flutter.py b/recipes/flutter.py
index fad9500..2ba44f7 100644
--- a/recipes/flutter.py
+++ b/recipes/flutter.py
@@ -11,7 +11,6 @@
'depot_tools/gsutil',
'depot_tools/osx_sdk',
'depot_tools/windows_sdk',
- 'flutter/json_util',
'flutter/kms',
'flutter/zip',
'fuchsia/display_util',
@@ -176,10 +175,6 @@
git_url, ref=git_ref, recursive=True, set_got_revision=True, tags=True)
checkout = api.path['checkout']
- if api.platform.is_linux:
- # Validates flutter builders json format.
- api.json_util.validate_json(checkout, 'flutter')
-
dart_bin = checkout.join('bin', 'cache', 'dart-sdk', 'bin')
flutter_bin = checkout.join('bin')
diff --git a/recipes/flutter/flutter_drone.expected/android_sdk.json b/recipes/flutter/flutter_drone.expected/android_sdk.json
index bbaf315..53b1dbc 100644
--- a/recipes/flutter/flutter_drone.expected/android_sdk.json
+++ b/recipes/flutter/flutter_drone.expected/android_sdk.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Chrome and driver dependency"
},
diff --git a/recipes/flutter/flutter_drone.expected/no_requirements.json b/recipes/flutter/flutter_drone.expected/no_requirements.json
index 25545bc..a9114a7 100644
--- a/recipes/flutter/flutter_drone.expected/no_requirements.json
+++ b/recipes/flutter/flutter_drone.expected/no_requirements.json
@@ -88,42 +88,6 @@
"name": "submodule update"
},
{
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/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": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]/flutter/dev/prod_builders.json",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "validate prod json format",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@prod_builders.json@\"\"@@@",
- "@@@STEP_LOG_END@prod_builders.json@@@"
- ]
- },
- {
"cmd": [],
"name": "Chrome and driver dependency"
},
diff --git a/recipes/flutter/flutter_drone.py b/recipes/flutter/flutter_drone.py
index b847cc1..ef3e61b 100644
--- a/recipes/flutter/flutter_drone.py
+++ b/recipes/flutter/flutter_drone.py
@@ -12,12 +12,10 @@
'flutter/android_sdk',
'flutter/repo_util',
'flutter/flutter_deps',
- 'flutter/json_util',
'flutter/os_utils',
'recipe_engine/context',
'recipe_engine/isolated',
'recipe_engine/path',
- 'recipe_engine/platform',
'recipe_engine/properties',
'recipe_engine/step',
]
@@ -41,9 +39,6 @@
checkout_path = api.path['start_dir'].join('flutter')
api.repo_util.checkout('flutter', api.properties.get('git_url'),
api.properties.get('git_ref'))
- if api.platform.is_linux:
- # Validates flutter builders json format.
- api.json_util.validate_json(checkout_path, 'flutter')
env, env_prefixes = api.repo_util.flutter_environment(checkout_path)
api.flutter_deps.chrome_and_driver(env, env_prefixes)
api.flutter_deps.open_jdk(env, env_prefixes)
@@ -58,6 +53,9 @@
else:
RunShard(api, env, env_prefixes, checkout_path)
+ # This is a noop for non windows tasks.
+ api.os_utils.kill_win_processes()
+
def GenTests(api):
yield api.test('no_requirements', api.repo_util.flutter_environment_data())
