Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Unified Diff: scripts/slave/recipe_modules/auto_bisect/example.expected/mac_bisector.json

Issue 2016363003: Revert of Avoid nesting steps called under waiting for x: (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipe_modules/auto_bisect/example.expected/mac_bisector.json
diff --git a/scripts/slave/recipe_modules/auto_bisect/example.expected/mac_bisector.json b/scripts/slave/recipe_modules/auto_bisect/example.expected/mac_bisector.json
index e89ac28f78a90f1c0037e254b43f01ddc6e94887..92a5f83ec6117994ccc05a49f3fd8feb8da5a9f7 100644
--- a/scripts/slave/recipe_modules/auto_bisect/example.expected/mac_bisector.json
+++ b/scripts/slave/recipe_modules/auto_bisect/example.expected/mac_bisector.json
@@ -223,6 +223,21 @@
},
{
"cmd": [
+ "git",
+ "footers",
+ "--position",
+ "a6298e4afedbf2cd461755ea6f45b0ad64222222"
+ ],
+ "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
+ "name": "resolving hash a6298e4afedbf2cd461755ea6f45b0ad64222222",
+ "stdout": "/path/to/tmp/"
+ },
+ {
+ "cmd": [],
+ "name": "Waiting for chromium@a6298e4afe"
+ },
+ {
+ "cmd": [
"python",
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
@@ -232,11 +247,14 @@
"ls",
"gs://chrome-perf/Mac Builder/full-build-mac_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip"
],
- "name": "gsutil ls (3)"
- },
- {
- "cmd": [],
- "name": "Triggering test job for a6298e4afedbf2cd461755ea6f45b0ad64222222",
+ "name": "Waiting for chromium@a6298e4afe.gsutil ls",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Waiting for chromium@a6298e4afe.Triggering test job for a6298e4afedbf2cd461755ea6f45b0ad64222222",
"trigger_specs": [
{
"builder_name": "chromium_rel_mac",
@@ -256,6 +274,9 @@
}
}
}
+ ],
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -264,8 +285,9 @@
"-u",
"\nimport sys\nimport time\ntime.sleep(20*60)\nsys.exit(0)\n"
],
- "name": "sleeping",
- "~followup_annotations": [
+ "name": "Waiting for chromium@a6298e4afe.sleeping",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@import time@@@",
@@ -285,7 +307,10 @@
"ls",
"gs://chrome-perf/bisect-results/a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results"
],
- "name": "gsutil ls (4)"
+ "name": "Waiting for chromium@a6298e4afe.gsutil ls (2)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -298,8 +323,26 @@
"cat",
"gs://chrome-perf/bisect-results/a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results"
],
- "name": "gsutil Get test results for build a6298e4afedbf2cd461755ea6f45b0ad64222222",
- "stdout": "/path/to/tmp/"
+ "name": "Waiting for chromium@a6298e4afe.gsutil Get test results for build a6298e4afedbf2cd461755ea6f45b0ad64222222",
+ "stdout": "/path/to/tmp/",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "git",
+ "footers",
+ "--position",
+ "00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111"
+ ],
+ "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
+ "name": "resolving hash 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
+ "stdout": "/path/to/tmp/"
+ },
+ {
+ "cmd": [],
+ "name": "Waiting for chromium@00316c9ddf"
},
{
"cmd": [
@@ -312,11 +355,14 @@
"ls",
"gs://chrome-perf/Mac Builder/full-build-mac_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip"
],
- "name": "gsutil ls (5)"
- },
- {
- "cmd": [],
- "name": "Triggering test job for 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
+ "name": "Waiting for chromium@00316c9ddf.gsutil ls",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Waiting for chromium@00316c9ddf.Triggering test job for 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
"trigger_specs": [
{
"builder_name": "chromium_rel_mac",
@@ -336,6 +382,9 @@
}
}
}
+ ],
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -344,8 +393,9 @@
"-u",
"\nimport sys\nimport time\ntime.sleep(20*60)\nsys.exit(0)\n"
],
- "name": "sleeping (2)",
- "~followup_annotations": [
+ "name": "Waiting for chromium@00316c9ddf.sleeping",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@import time@@@",
@@ -365,7 +415,10 @@
"ls",
"gs://chrome-perf/bisect-results/00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test.results"
],
- "name": "gsutil ls (6)"
+ "name": "Waiting for chromium@00316c9ddf.gsutil ls (2)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -378,8 +431,11 @@
"cat",
"gs://chrome-perf/bisect-results/00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test.results"
],
- "name": "gsutil Get test results for build 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
- "stdout": "/path/to/tmp/"
+ "name": "Waiting for chromium@00316c9ddf.gsutil Get test results for build 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
+ "stdout": "/path/to/tmp/",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -392,7 +448,7 @@
"ls",
"gs://chrome-perf/Mac Builder/full-build-mac_dcdcdc0ff1122212323134879ddceeb1240b0988.zip"
],
- "name": "gsutil ls (7)"
+ "name": "gsutil ls (3)"
},
{
"cmd": [
@@ -417,6 +473,21 @@
},
{
"cmd": [
+ "git",
+ "footers",
+ "--position",
+ "dcdcdc0ff1122212323134879ddceeb1240b0988"
+ ],
+ "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
+ "name": "resolving hash dcdcdc0ff1122212323134879ddceeb1240b0988",
+ "stdout": "/path/to/tmp/"
+ },
+ {
+ "cmd": [],
+ "name": "Waiting for chromium@dcdcdc0ff1"
+ },
+ {
+ "cmd": [
"python",
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
@@ -426,11 +497,14 @@
"ls",
"gs://chrome-perf/Mac Builder/full-build-mac_dcdcdc0ff1122212323134879ddceeb1240b0988.zip"
],
- "name": "gsutil ls (8)"
- },
- {
- "cmd": [],
- "name": "Triggering test job for dcdcdc0ff1122212323134879ddceeb1240b0988",
+ "name": "Waiting for chromium@dcdcdc0ff1.gsutil ls",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Waiting for chromium@dcdcdc0ff1.Triggering test job for dcdcdc0ff1122212323134879ddceeb1240b0988",
"trigger_specs": [
{
"builder_name": "chromium_rel_mac",
@@ -450,6 +524,9 @@
}
}
}
+ ],
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -458,8 +535,9 @@
"-u",
"\nimport sys\nimport time\ntime.sleep(20*60)\nsys.exit(0)\n"
],
- "name": "sleeping (3)",
- "~followup_annotations": [
+ "name": "Waiting for chromium@dcdcdc0ff1.sleeping",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@import time@@@",
@@ -479,7 +557,10 @@
"ls",
"gs://chrome-perf/bisect-results/dcdcdc0ff1122212323134879ddceeb1240b0988-test.results"
],
- "name": "gsutil ls (9)"
+ "name": "Waiting for chromium@dcdcdc0ff1.gsutil ls (2)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -492,8 +573,11 @@
"cat",
"gs://chrome-perf/bisect-results/dcdcdc0ff1122212323134879ddceeb1240b0988-test.results"
],
- "name": "gsutil Get test results for build dcdcdc0ff1122212323134879ddceeb1240b0988",
- "stdout": "/path/to/tmp/"
+ "name": "Waiting for chromium@dcdcdc0ff1.gsutil Get test results for build dcdcdc0ff1122212323134879ddceeb1240b0988",
+ "stdout": "/path/to/tmp/",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -504,9 +588,10 @@
"[12, 13, 14, 15, 16]",
"0.01"
],
- "name": "Checking sample difference",
+ "name": "Waiting for chromium@dcdcdc0ff1.Checking sample difference",
"stdout": "/path/to/tmp/json",
"~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
"@@@STEP_LOG_END@json.output (invalid)@@@"
]
@@ -520,9 +605,10 @@
"[12, 13, 14, 15, 16]",
"0.01"
],
- "name": "Checking sample difference (2)",
+ "name": "Waiting for chromium@dcdcdc0ff1.Checking sample difference (2)",
"stdout": "/path/to/tmp/json",
"~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
"@@@STEP_LOG_END@json.output (invalid)@@@"
]
@@ -643,17 +729,6 @@
"stdout": "/path/to/tmp/"
},
{
- "cmd": [
- "git",
- "footers",
- "--position",
- "a6298e4afedbf2cd461755ea6f45b0ad64222222"
- ],
- "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
- "name": "resolving hash a6298e4afedbf2cd461755ea6f45b0ad64222222",
- "stdout": "/path/to/tmp/"
- },
- {
"cmd": [],
"name": "Wiggling revision chromium@a6298e4afe,v8@003"
},
@@ -668,7 +743,7 @@
"ls",
"gs://chrome-perf/Mac Builder/full-build-mac_a6298e4afedbf2cd461755ea6f45b0ad64222222_51e7ed4b63ad81d8b499e42b888149349afaaca1.zip"
],
- "name": "gsutil ls (10)"
+ "name": "gsutil ls (4)"
},
{
"cmd": [

Powered by Google App Engine
This is Rietveld 408576698