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

Unified Diff: scripts/slave/recipe_modules/chromedriver/example.expected/Android_ChromeDriver_basic.json

Issue 2164043002: Clean up steps in Chromedriver recipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Give server_logs unique names Created 4 years, 5 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/chromedriver/example.expected/Android_ChromeDriver_basic.json
diff --git a/scripts/slave/recipe_modules/chromedriver/example.expected/Android_ChromeDriver_basic.json b/scripts/slave/recipe_modules/chromedriver/example.expected/Android_ChromeDriver_basic.json
index 400405adeb7313ec84147b53e4ead9978a19e1ee..39b2eabc210efc6f98fd52c7e036b9726d309169 100644
--- a/scripts/slave/recipe_modules/chromedriver/example.expected/Android_ChromeDriver_basic.json
+++ b/scripts/slave/recipe_modules/chromedriver/example.expected/Android_ChromeDriver_basic.json
@@ -172,6 +172,10 @@
]
},
{
+ "cmd": [],
+ "name": "python_tests chrome_shell"
+ },
+ {
"cmd": [
"xvfb-run",
"-a",
@@ -179,7 +183,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Release/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_2/server_log",
+ "[TMP_BASE]/server_log_tmp_2/python_tests_chrome_shell_571",
"--reference-chromedriver",
"[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
"--android-package",
@@ -188,7 +192,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "python_tests(chrome_shell)"
+ "name": "python_tests chrome_shell.Run test python_tests chrome_shell",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -199,12 +206,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_2/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_2/python_tests_chrome_shell_571",
+ "gs://chromedriver-data/server_logs/python_tests_chrome_shell_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_2/server_log",
+ "name": "python_tests chrome_shell.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_2/python_tests_chrome_shell_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_2/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_2/python_tests_chrome_shell_571@https://storage.cloud.google.com/chromedriver-data/server_logs/python_tests_chrome_shell_571@@@"
]
},
{
@@ -214,7 +222,14 @@
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
"[TMP_BASE]/server_log_tmp_2"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_2"
+ "name": "python_tests chrome_shell.rmtree [TMP_BASE]/server_log_tmp_2",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "java_tests chrome_shell"
},
{
"cmd": [
@@ -224,7 +239,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Release/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_3/server_log",
+ "[TMP_BASE]/server_log_tmp_3/java_tests_chrome_shell_571",
"--verbose",
"--android-package",
"chrome_shell"
@@ -232,7 +247,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "java_tests(chrome_shell)"
+ "name": "java_tests chrome_shell.Run test java_tests chrome_shell",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -243,12 +261,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_3/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_3/java_tests_chrome_shell_571",
+ "gs://chromedriver-data/server_logs/java_tests_chrome_shell_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_3/server_log",
+ "name": "java_tests chrome_shell.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_3/java_tests_chrome_shell_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_3/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_3/java_tests_chrome_shell_571@https://storage.cloud.google.com/chromedriver-data/server_logs/java_tests_chrome_shell_571@@@"
]
},
{
@@ -258,7 +277,14 @@
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
"[TMP_BASE]/server_log_tmp_3"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_3"
+ "name": "java_tests chrome_shell.rmtree [TMP_BASE]/server_log_tmp_3",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "python_tests chrome_stable"
},
{
"cmd": [
@@ -268,7 +294,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Release/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_4/server_log",
+ "[TMP_BASE]/server_log_tmp_4/python_tests_chrome_stable_571",
"--reference-chromedriver",
"[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
"--android-package",
@@ -277,7 +303,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "python_tests(chrome_stable)"
+ "name": "python_tests chrome_stable.Run test python_tests chrome_stable",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -288,12 +317,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_4/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_4/python_tests_chrome_stable_571",
+ "gs://chromedriver-data/server_logs/python_tests_chrome_stable_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_4/server_log",
+ "name": "python_tests chrome_stable.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_4/python_tests_chrome_stable_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_4/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_4/python_tests_chrome_stable_571@https://storage.cloud.google.com/chromedriver-data/server_logs/python_tests_chrome_stable_571@@@"
]
},
{
@@ -303,7 +333,14 @@
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
"[TMP_BASE]/server_log_tmp_4"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_4"
+ "name": "python_tests chrome_stable.rmtree [TMP_BASE]/server_log_tmp_4",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "java_tests chrome_stable"
},
{
"cmd": [
@@ -313,7 +350,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Release/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_5/server_log",
+ "[TMP_BASE]/server_log_tmp_5/java_tests_chrome_stable_571",
"--verbose",
"--android-package",
"chrome_stable"
@@ -321,7 +358,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "java_tests(chrome_stable)"
+ "name": "java_tests chrome_stable.Run test java_tests chrome_stable",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -332,12 +372,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_5/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_5/java_tests_chrome_stable_571",
+ "gs://chromedriver-data/server_logs/java_tests_chrome_stable_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_5/server_log",
+ "name": "java_tests chrome_stable.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_5/java_tests_chrome_stable_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_5/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_5/java_tests_chrome_stable_571@https://storage.cloud.google.com/chromedriver-data/server_logs/java_tests_chrome_stable_571@@@"
]
},
{
@@ -347,7 +388,14 @@
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
"[TMP_BASE]/server_log_tmp_5"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_5"
+ "name": "java_tests chrome_stable.rmtree [TMP_BASE]/server_log_tmp_5",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "python_tests chrome_beta"
},
{
"cmd": [
@@ -357,7 +405,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Release/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_6/server_log",
+ "[TMP_BASE]/server_log_tmp_6/python_tests_chrome_beta_571",
"--reference-chromedriver",
"[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
"--android-package",
@@ -366,7 +414,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "python_tests(chrome_beta)"
+ "name": "python_tests chrome_beta.Run test python_tests chrome_beta",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -377,12 +428,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_6/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_6/python_tests_chrome_beta_571",
+ "gs://chromedriver-data/server_logs/python_tests_chrome_beta_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_6/server_log",
+ "name": "python_tests chrome_beta.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_6/python_tests_chrome_beta_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_6/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_6/python_tests_chrome_beta_571@https://storage.cloud.google.com/chromedriver-data/server_logs/python_tests_chrome_beta_571@@@"
]
},
{
@@ -392,7 +444,14 @@
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
"[TMP_BASE]/server_log_tmp_6"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_6"
+ "name": "python_tests chrome_beta.rmtree [TMP_BASE]/server_log_tmp_6",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "java_tests chrome_beta"
},
{
"cmd": [
@@ -402,7 +461,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Release/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_7/server_log",
+ "[TMP_BASE]/server_log_tmp_7/java_tests_chrome_beta_571",
"--verbose",
"--android-package",
"chrome_beta"
@@ -410,7 +469,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "java_tests(chrome_beta)"
+ "name": "java_tests chrome_beta.Run test java_tests chrome_beta",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -421,12 +483,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_7/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_7/java_tests_chrome_beta_571",
+ "gs://chromedriver-data/server_logs/java_tests_chrome_beta_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_7/server_log",
+ "name": "java_tests chrome_beta.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_7/java_tests_chrome_beta_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_7/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_7/java_tests_chrome_beta_571@https://storage.cloud.google.com/chromedriver-data/server_logs/java_tests_chrome_beta_571@@@"
]
},
{
@@ -436,7 +499,14 @@
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
"[TMP_BASE]/server_log_tmp_7"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_7"
+ "name": "java_tests chrome_beta.rmtree [TMP_BASE]/server_log_tmp_7",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "python_tests chromedriver_webview_shell"
},
{
"cmd": [
@@ -446,7 +516,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Release/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_8/server_log",
+ "[TMP_BASE]/server_log_tmp_8/python_tests_chromedriver_webview_shell_571",
"--reference-chromedriver",
"[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
"--android-package",
@@ -455,7 +525,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "python_tests(chromedriver_webview_shell)"
+ "name": "python_tests chromedriver_webview_shell.Run test python_tests chromedriver_webview_shell",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -466,12 +539,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_8/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_8/python_tests_chromedriver_webview_shell_571",
+ "gs://chromedriver-data/server_logs/python_tests_chromedriver_webview_shell_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_8/server_log",
+ "name": "python_tests chromedriver_webview_shell.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_8/python_tests_chromedriver_webview_shell_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_8/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_8/python_tests_chromedriver_webview_shell_571@https://storage.cloud.google.com/chromedriver-data/server_logs/python_tests_chromedriver_webview_shell_571@@@"
]
},
{
@@ -481,7 +555,14 @@
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
"[TMP_BASE]/server_log_tmp_8"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_8"
+ "name": "python_tests chromedriver_webview_shell.rmtree [TMP_BASE]/server_log_tmp_8",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "java_tests chromedriver_webview_shell"
},
{
"cmd": [
@@ -491,7 +572,7 @@
"--chromedriver",
"[SLAVE_BUILD]/src/out/Release/chromedriver",
"--log-path",
- "[TMP_BASE]/server_log_tmp_9/server_log",
+ "[TMP_BASE]/server_log_tmp_9/java_tests_chromedriver_webview_shell_571",
"--verbose",
"--android-package",
"chromedriver_webview_shell"
@@ -499,7 +580,10 @@
"env": {
"PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
},
- "name": "java_tests(chromedriver_webview_shell)"
+ "name": "java_tests chromedriver_webview_shell.Run test java_tests chromedriver_webview_shell",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -510,12 +594,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/server_log_tmp_9/server_log",
- "gs://chromedriver-data/server_logs/server_log"
+ "[TMP_BASE]/server_log_tmp_9/java_tests_chromedriver_webview_shell_571",
+ "gs://chromedriver-data/server_logs/java_tests_chromedriver_webview_shell_571"
],
- "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_9/server_log",
+ "name": "java_tests chromedriver_webview_shell.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_9/java_tests_chromedriver_webview_shell_571",
"~followup_annotations": [
- "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_9/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_9/java_tests_chromedriver_webview_shell_571@https://storage.cloud.google.com/chromedriver-data/server_logs/java_tests_chromedriver_webview_shell_571@@@"
]
},
{
@@ -525,7 +610,10 @@
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
"[TMP_BASE]/server_log_tmp_9"
],
- "name": "rmtree [TMP_BASE]/server_log_tmp_9"
+ "name": "java_tests chromedriver_webview_shell.rmtree [TMP_BASE]/server_log_tmp_9",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [],

Powered by Google App Engine
This is Rietveld 408576698