save_logs: Ignore nested JSON files
Ignore arbitrarily nested JSON files when saving logs. Since they still
provide some value for env setup, continue to include JSON files under
'cipd'.
This will make builds like http://ci.chromium.org/b/8747764136503746385
not spend nearly so much time copying big JSON files around (see step
5.4.53).
Also sort the list of patterns.
Change-Id: I0683fc2f01719001f33e80c6ed79b85a66126b1b
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/210233
Commit-Queue: Rob Mohr <mohrr@google.com>
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
diff --git a/recipe_modules/environment/tests/full.expected/doctor-fail.json b/recipe_modules/environment/tests/full.expected/doctor-fail.json
index 331478d..35b16c8 100644
--- a/recipe_modules/environment/tests/full.expected/doctor-fail.json
+++ b/recipe_modules/environment/tests/full.expected/doctor-fail.json
@@ -197,81 +197,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000034.5
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000036.0
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000037.5
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
"*.bat",
"--hidden"
],
@@ -279,7 +204,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000039.0
+ "soft_deadline": 1337000034.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.bat",
@@ -304,7 +229,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000040.5
+ "soft_deadline": 1337000036.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.compdb",
@@ -329,7 +254,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000042.0
+ "soft_deadline": 1337000037.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.gn",
@@ -354,7 +279,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000043.5
+ "soft_deadline": 1337000039.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.graph",
@@ -379,7 +304,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000045.0
+ "soft_deadline": 1337000040.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.json",
@@ -404,7 +329,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000046.5
+ "soft_deadline": 1337000042.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.log",
@@ -436,7 +361,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000048.0
+ "soft_deadline": 1337000043.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.sh",
@@ -461,7 +386,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000049.5
+ "soft_deadline": 1337000045.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.stderr",
@@ -486,7 +411,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000051.0
+ "soft_deadline": 1337000046.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.stdout",
@@ -511,7 +436,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000052.5
+ "soft_deadline": 1337000048.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.txt",
@@ -536,7 +461,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000054.0
+ "soft_deadline": 1337000049.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.cfg",
@@ -561,7 +486,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000055.5
+ "soft_deadline": 1337000051.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.ensure",
@@ -579,31 +504,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000057.0
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
"*/*.log",
"--hidden"
],
@@ -611,7 +511,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000058.5
+ "soft_deadline": 1337000052.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.log",
@@ -636,7 +536,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000060.0
+ "soft_deadline": 1337000054.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.txt",
@@ -654,6 +554,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000055.5
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000057.0
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
"*_log",
"--hidden"
],
@@ -661,7 +611,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000061.5
+ "soft_deadline": 1337000058.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*_log",
@@ -679,6 +629,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000060.0
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000061.5
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.coverage_reports/*.tar.gz",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
"pigweed_environment.gni",
"--hidden"
],
@@ -704,7 +704,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -714,7 +714,7 @@
"soft_deadline": 1337000064.5
}
},
- "name": "environment.run pw_env_setup.logs.glob.coverage_reports/*.tar.gz",
+ "name": "environment.run pw_env_setup.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/environment/tests/full.expected/normal.json b/recipe_modules/environment/tests/full.expected/normal.json
index 01fbfd9..c7a03f6 100644
--- a/recipe_modules/environment/tests/full.expected/normal.json
+++ b/recipe_modules/environment/tests/full.expected/normal.json
@@ -420,81 +420,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000037.5
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000039.0
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000040.5
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
"*.bat",
"--hidden"
],
@@ -502,7 +427,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000042.0
+ "soft_deadline": 1337000037.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.bat",
@@ -527,7 +452,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000043.5
+ "soft_deadline": 1337000039.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.compdb",
@@ -552,7 +477,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000045.0
+ "soft_deadline": 1337000040.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.gn",
@@ -577,7 +502,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000046.5
+ "soft_deadline": 1337000042.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.graph",
@@ -602,7 +527,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000048.0
+ "soft_deadline": 1337000043.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.json",
@@ -627,7 +552,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000049.5
+ "soft_deadline": 1337000045.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.log",
@@ -659,7 +584,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000051.0
+ "soft_deadline": 1337000046.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.sh",
@@ -684,7 +609,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000052.5
+ "soft_deadline": 1337000048.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.stderr",
@@ -709,7 +634,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000054.0
+ "soft_deadline": 1337000049.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.stdout",
@@ -734,7 +659,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000055.5
+ "soft_deadline": 1337000051.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.txt",
@@ -759,7 +684,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000057.0
+ "soft_deadline": 1337000052.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.cfg",
@@ -784,7 +709,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000058.5
+ "soft_deadline": 1337000054.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.ensure",
@@ -802,31 +727,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000060.0
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
"*/*.log",
"--hidden"
],
@@ -834,7 +734,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000061.5
+ "soft_deadline": 1337000055.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.log",
@@ -859,7 +759,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000063.0
+ "soft_deadline": 1337000057.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.txt",
@@ -877,6 +777,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000058.5
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000060.0
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
"*_log",
"--hidden"
],
@@ -884,7 +834,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000064.5
+ "soft_deadline": 1337000061.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*_log",
@@ -902,6 +852,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000063.0
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000064.5
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.coverage_reports/*.tar.gz",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
"pigweed_environment.gni",
"--hidden"
],
@@ -927,7 +927,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -937,7 +937,7 @@
"soft_deadline": 1337000067.5
}
},
- "name": "environment.run pw_env_setup.logs.glob.coverage_reports/*.tar.gz",
+ "name": "environment.run pw_env_setup.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/environment/tests/full.expected/override-cas.json b/recipe_modules/environment/tests/full.expected/override-cas.json
index 4afc618..fd4b098 100644
--- a/recipe_modules/environment/tests/full.expected/override-cas.json
+++ b/recipe_modules/environment/tests/full.expected/override-cas.json
@@ -195,81 +195,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000034.5
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000036.0
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000037.5
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
"*.bat",
"--hidden"
],
@@ -277,7 +202,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000039.0
+ "soft_deadline": 1337000034.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.bat",
@@ -302,7 +227,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000040.5
+ "soft_deadline": 1337000036.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.compdb",
@@ -327,7 +252,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000042.0
+ "soft_deadline": 1337000037.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.gn",
@@ -352,7 +277,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000043.5
+ "soft_deadline": 1337000039.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.graph",
@@ -377,7 +302,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000045.0
+ "soft_deadline": 1337000040.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.json",
@@ -402,7 +327,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000046.5
+ "soft_deadline": 1337000042.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.log",
@@ -434,7 +359,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000048.0
+ "soft_deadline": 1337000043.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.sh",
@@ -459,7 +384,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000049.5
+ "soft_deadline": 1337000045.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.stderr",
@@ -484,7 +409,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000051.0
+ "soft_deadline": 1337000046.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.stdout",
@@ -509,7 +434,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000052.5
+ "soft_deadline": 1337000048.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.txt",
@@ -534,7 +459,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000054.0
+ "soft_deadline": 1337000049.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.cfg",
@@ -559,7 +484,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000055.5
+ "soft_deadline": 1337000051.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.ensure",
@@ -577,31 +502,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000057.0
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
"*/*.log",
"--hidden"
],
@@ -609,7 +509,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000058.5
+ "soft_deadline": 1337000052.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.log",
@@ -634,7 +534,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000060.0
+ "soft_deadline": 1337000054.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.txt",
@@ -652,6 +552,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000055.5
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000057.0
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
"*_log",
"--hidden"
],
@@ -659,7 +609,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000061.5
+ "soft_deadline": 1337000058.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*_log",
@@ -677,6 +627,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000060.0
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000061.5
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.coverage_reports/*.tar.gz",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
"pigweed_environment.gni",
"--hidden"
],
@@ -702,7 +702,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -712,7 +712,7 @@
"soft_deadline": 1337000064.5
}
},
- "name": "environment.run pw_env_setup.logs.glob.coverage_reports/*.tar.gz",
+ "name": "environment.run pw_env_setup.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/environment/tests/full.expected/override-cipd.json b/recipe_modules/environment/tests/full.expected/override-cipd.json
index 68b8a4c..5ac1ada 100644
--- a/recipe_modules/environment/tests/full.expected/override-cipd.json
+++ b/recipe_modules/environment/tests/full.expected/override-cipd.json
@@ -195,81 +195,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000034.5
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000036.0
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000037.5
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
"*.bat",
"--hidden"
],
@@ -277,7 +202,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000039.0
+ "soft_deadline": 1337000034.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.bat",
@@ -302,7 +227,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000040.5
+ "soft_deadline": 1337000036.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.compdb",
@@ -327,7 +252,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000042.0
+ "soft_deadline": 1337000037.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.gn",
@@ -352,7 +277,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000043.5
+ "soft_deadline": 1337000039.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.graph",
@@ -377,7 +302,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000045.0
+ "soft_deadline": 1337000040.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.json",
@@ -402,7 +327,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000046.5
+ "soft_deadline": 1337000042.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.log",
@@ -434,7 +359,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000048.0
+ "soft_deadline": 1337000043.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.sh",
@@ -459,7 +384,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000049.5
+ "soft_deadline": 1337000045.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.stderr",
@@ -484,7 +409,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000051.0
+ "soft_deadline": 1337000046.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.stdout",
@@ -509,7 +434,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000052.5
+ "soft_deadline": 1337000048.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.txt",
@@ -534,7 +459,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000054.0
+ "soft_deadline": 1337000049.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.cfg",
@@ -559,7 +484,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000055.5
+ "soft_deadline": 1337000051.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.ensure",
@@ -577,31 +502,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000057.0
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
"*/*.log",
"--hidden"
],
@@ -609,7 +509,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000058.5
+ "soft_deadline": 1337000052.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.log",
@@ -634,7 +534,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000060.0
+ "soft_deadline": 1337000054.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.txt",
@@ -652,6 +552,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000055.5
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000057.0
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
"*_log",
"--hidden"
],
@@ -659,7 +609,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000061.5
+ "soft_deadline": 1337000058.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*_log",
@@ -677,6 +627,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000060.0
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000061.5
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.coverage_reports/*.tar.gz",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
"pigweed_environment.gni",
"--hidden"
],
@@ -702,7 +702,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -712,7 +712,7 @@
"soft_deadline": 1337000064.5
}
},
- "name": "environment.run pw_env_setup.logs.glob.coverage_reports/*.tar.gz",
+ "name": "environment.run pw_env_setup.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/environment/tests/full.expected/windows.json b/recipe_modules/environment/tests/full.expected/windows.json
index f285c92..1859497 100644
--- a/recipe_modules/environment/tests/full.expected/windows.json
+++ b/recipe_modules/environment/tests/full.expected/windows.json
@@ -195,81 +195,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]\\environment",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000034.5
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]\\environment",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000036.0
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]\\environment",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000037.5
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]\\environment",
"*.bat",
"--hidden"
],
@@ -277,7 +202,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000039.0
+ "soft_deadline": 1337000034.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.bat",
@@ -302,7 +227,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000040.5
+ "soft_deadline": 1337000036.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.compdb",
@@ -327,7 +252,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000042.0
+ "soft_deadline": 1337000037.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.gn",
@@ -352,7 +277,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000043.5
+ "soft_deadline": 1337000039.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.graph",
@@ -377,7 +302,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000045.0
+ "soft_deadline": 1337000040.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.json",
@@ -402,7 +327,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000046.5
+ "soft_deadline": 1337000042.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.log",
@@ -434,7 +359,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000048.0
+ "soft_deadline": 1337000043.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.sh",
@@ -459,7 +384,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000049.5
+ "soft_deadline": 1337000045.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.stderr",
@@ -484,7 +409,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000051.0
+ "soft_deadline": 1337000046.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*.stdout",
@@ -509,7 +434,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000052.5
+ "soft_deadline": 1337000048.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*.txt",
@@ -534,7 +459,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000054.0
+ "soft_deadline": 1337000049.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.cfg",
@@ -559,7 +484,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000055.5
+ "soft_deadline": 1337000051.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.ensure",
@@ -577,31 +502,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]\\environment",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000057.0
- }
- },
- "name": "environment.run pw_env_setup.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]\\environment",
"*/*.log",
"--hidden"
],
@@ -609,7 +509,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000058.5
+ "soft_deadline": 1337000052.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.log",
@@ -634,7 +534,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000060.0
+ "soft_deadline": 1337000054.0
}
},
"name": "environment.run pw_env_setup.logs.glob.*/*.txt",
@@ -652,6 +552,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]\\environment",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000055.5
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]\\environment",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000057.0
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]\\environment",
"*_log",
"--hidden"
],
@@ -659,7 +609,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000061.5
+ "soft_deadline": 1337000058.5
}
},
"name": "environment.run pw_env_setup.logs.glob.*_log",
@@ -677,6 +627,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]\\environment",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000060.0
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]\\environment",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000061.5
+ }
+ },
+ "name": "environment.run pw_env_setup.logs.glob.coverage_reports/*.tar.gz",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]\\environment",
"pigweed_environment.gni",
"--hidden"
],
@@ -702,7 +702,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]\\environment",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -712,7 +712,7 @@
"soft_deadline": 1337000064.5
}
},
- "name": "environment.run pw_env_setup.logs.glob.coverage_reports/*.tar.gz",
+ "name": "environment.run pw_env_setup.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json b/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json
index 7c58078..08fb68e 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json
@@ -1765,111 +1765,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/program_0",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000060.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "program_0.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/program_0",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000061.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "program_0.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/program_0",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000063.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "program_0.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/program_0",
"*.bat",
"--hidden"
],
@@ -1877,7 +1772,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000064.5
+ "soft_deadline": 1337000060.0
},
"realm": {
"name": "project:ci"
@@ -1912,7 +1807,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000066.0
+ "soft_deadline": 1337000061.5
},
"realm": {
"name": "project:ci"
@@ -1947,7 +1842,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000067.5
+ "soft_deadline": 1337000063.0
},
"realm": {
"name": "project:ci"
@@ -1982,7 +1877,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000069.0
+ "soft_deadline": 1337000064.5
},
"realm": {
"name": "project:ci"
@@ -2017,7 +1912,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000070.5
+ "soft_deadline": 1337000066.0
},
"realm": {
"name": "project:ci"
@@ -2052,7 +1947,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000072.0
+ "soft_deadline": 1337000067.5
},
"realm": {
"name": "project:ci"
@@ -2094,7 +1989,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000073.5
+ "soft_deadline": 1337000069.0
},
"realm": {
"name": "project:ci"
@@ -2129,7 +2024,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000075.0
+ "soft_deadline": 1337000070.5
},
"realm": {
"name": "project:ci"
@@ -2164,7 +2059,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000076.5
+ "soft_deadline": 1337000072.0
},
"realm": {
"name": "project:ci"
@@ -2199,7 +2094,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000078.0
+ "soft_deadline": 1337000073.5
},
"realm": {
"name": "project:ci"
@@ -2234,7 +2129,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000079.5
+ "soft_deadline": 1337000075.0
},
"realm": {
"name": "project:ci"
@@ -2269,7 +2164,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000081.0
+ "soft_deadline": 1337000076.5
},
"realm": {
"name": "project:ci"
@@ -2297,41 +2192,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/program_0",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000082.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "program_0.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/program_0",
"*/*.log",
"--hidden"
],
@@ -2339,7 +2199,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000084.0
+ "soft_deadline": 1337000078.0
},
"realm": {
"name": "project:ci"
@@ -2374,7 +2234,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000085.5
+ "soft_deadline": 1337000079.5
},
"realm": {
"name": "project:ci"
@@ -2402,6 +2262,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/program_0",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000081.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "program_0.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/program_0",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000082.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "program_0.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/program_0",
"*_log",
"--hidden"
],
@@ -2409,6 +2339,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1337000084.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "program_0.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/program_0",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000085.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "program_0.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/program_0",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1337000087.0
},
"realm": {
@@ -2422,7 +2422,7 @@
"hostname": "rdbhost"
}
},
- "name": "program_0.logs.glob.*_log",
+ "name": "program_0.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -2472,7 +2472,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/program_0",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -2492,7 +2492,7 @@
"hostname": "rdbhost"
}
},
- "name": "program_0.logs.glob.coverage_reports/*.tar.gz",
+ "name": "program_0.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -3223,111 +3223,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/program_1",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000094.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "program_1.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/program_1",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000096.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "program_1.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/program_1",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000097.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "program_1.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/program_1",
"*.bat",
"--hidden"
],
@@ -3335,7 +3230,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000099.0
+ "soft_deadline": 1337000094.5
},
"realm": {
"name": "project:ci"
@@ -3370,7 +3265,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000100.5
+ "soft_deadline": 1337000096.0
},
"realm": {
"name": "project:ci"
@@ -3405,7 +3300,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000102.0
+ "soft_deadline": 1337000097.5
},
"realm": {
"name": "project:ci"
@@ -3440,7 +3335,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000103.5
+ "soft_deadline": 1337000099.0
},
"realm": {
"name": "project:ci"
@@ -3475,7 +3370,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000105.0
+ "soft_deadline": 1337000100.5
},
"realm": {
"name": "project:ci"
@@ -3510,7 +3405,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000106.5
+ "soft_deadline": 1337000102.0
},
"realm": {
"name": "project:ci"
@@ -3552,7 +3447,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000108.0
+ "soft_deadline": 1337000103.5
},
"realm": {
"name": "project:ci"
@@ -3587,7 +3482,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000109.5
+ "soft_deadline": 1337000105.0
},
"realm": {
"name": "project:ci"
@@ -3622,7 +3517,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000111.0
+ "soft_deadline": 1337000106.5
},
"realm": {
"name": "project:ci"
@@ -3657,7 +3552,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000112.5
+ "soft_deadline": 1337000108.0
},
"realm": {
"name": "project:ci"
@@ -3692,7 +3587,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000114.0
+ "soft_deadline": 1337000109.5
},
"realm": {
"name": "project:ci"
@@ -3727,7 +3622,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000115.5
+ "soft_deadline": 1337000111.0
},
"realm": {
"name": "project:ci"
@@ -3755,41 +3650,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/program_1",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000117.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "program_1.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/program_1",
"*/*.log",
"--hidden"
],
@@ -3797,7 +3657,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000118.5
+ "soft_deadline": 1337000112.5
},
"realm": {
"name": "project:ci"
@@ -3832,7 +3692,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000120.0
+ "soft_deadline": 1337000114.0
},
"realm": {
"name": "project:ci"
@@ -3860,6 +3720,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/program_1",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000115.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "program_1.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/program_1",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000117.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "program_1.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/program_1",
"*_log",
"--hidden"
],
@@ -3867,6 +3797,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1337000118.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "program_1.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/program_1",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000120.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "program_1.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/program_1",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1337000121.5
},
"realm": {
@@ -3880,7 +3880,7 @@
"hostname": "rdbhost"
}
},
- "name": "program_1.logs.glob.*_log",
+ "name": "program_1.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -3930,7 +3930,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/program_1",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -3950,7 +3950,7 @@
"hostname": "rdbhost"
}
},
- "name": "program_1.logs.glob.coverage_reports/*.tar.gz",
+ "name": "program_1.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/cipd.json b/recipe_modules/pw_presubmit/tests/full.expected/cipd.json
index b574595..cfeb437 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/cipd.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/cipd.json
@@ -1942,111 +1942,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000060.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000061.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000063.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*.bat",
"--hidden"
],
@@ -2054,7 +1949,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000064.5
+ "soft_deadline": 1337000060.0
},
"realm": {
"name": "project:ci"
@@ -2089,7 +1984,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000066.0
+ "soft_deadline": 1337000061.5
},
"realm": {
"name": "project:ci"
@@ -2124,7 +2019,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000067.5
+ "soft_deadline": 1337000063.0
},
"realm": {
"name": "project:ci"
@@ -2159,7 +2054,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000069.0
+ "soft_deadline": 1337000064.5
},
"realm": {
"name": "project:ci"
@@ -2194,7 +2089,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000070.5
+ "soft_deadline": 1337000066.0
},
"realm": {
"name": "project:ci"
@@ -2229,7 +2124,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000072.0
+ "soft_deadline": 1337000067.5
},
"realm": {
"name": "project:ci"
@@ -2271,7 +2166,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000073.5
+ "soft_deadline": 1337000069.0
},
"realm": {
"name": "project:ci"
@@ -2306,7 +2201,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000075.0
+ "soft_deadline": 1337000070.5
},
"realm": {
"name": "project:ci"
@@ -2341,7 +2236,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000076.5
+ "soft_deadline": 1337000072.0
},
"realm": {
"name": "project:ci"
@@ -2376,7 +2271,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000078.0
+ "soft_deadline": 1337000073.5
},
"realm": {
"name": "project:ci"
@@ -2411,7 +2306,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000079.5
+ "soft_deadline": 1337000075.0
},
"realm": {
"name": "project:ci"
@@ -2446,7 +2341,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000081.0
+ "soft_deadline": 1337000076.5
},
"realm": {
"name": "project:ci"
@@ -2474,41 +2369,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000082.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*/*.log",
"--hidden"
],
@@ -2516,7 +2376,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000084.0
+ "soft_deadline": 1337000078.0
},
"realm": {
"name": "project:ci"
@@ -2551,7 +2411,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000085.5
+ "soft_deadline": 1337000079.5
},
"realm": {
"name": "project:ci"
@@ -2579,6 +2439,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000081.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000082.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
"*_log",
"--hidden"
],
@@ -2586,6 +2516,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1337000084.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000085.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1337000087.0
},
"realm": {
@@ -2599,7 +2599,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.*_log",
+ "name": "step1.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -2649,7 +2649,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -2669,7 +2669,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step1.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json
index b67e224..d5c1c18 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json
@@ -1928,111 +1928,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000390.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000410.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000430.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*.bat",
"--hidden"
],
@@ -2040,7 +1935,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000450.0
+ "soft_deadline": 1600000390.0
},
"realm": {
"name": "project:try"
@@ -2075,7 +1970,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000470.0
+ "soft_deadline": 1600000410.0
},
"realm": {
"name": "project:try"
@@ -2110,7 +2005,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000490.0
+ "soft_deadline": 1600000430.0
},
"realm": {
"name": "project:try"
@@ -2145,7 +2040,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000510.0
+ "soft_deadline": 1600000450.0
},
"realm": {
"name": "project:try"
@@ -2180,7 +2075,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000530.0
+ "soft_deadline": 1600000470.0
},
"realm": {
"name": "project:try"
@@ -2215,7 +2110,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000550.0
+ "soft_deadline": 1600000490.0
},
"realm": {
"name": "project:try"
@@ -2257,7 +2152,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000570.0
+ "soft_deadline": 1600000510.0
},
"realm": {
"name": "project:try"
@@ -2292,7 +2187,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000590.0
+ "soft_deadline": 1600000530.0
},
"realm": {
"name": "project:try"
@@ -2327,7 +2222,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000610.0
+ "soft_deadline": 1600000550.0
},
"realm": {
"name": "project:try"
@@ -2362,7 +2257,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000630.0
+ "soft_deadline": 1600000570.0
},
"realm": {
"name": "project:try"
@@ -2397,7 +2292,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000650.0
+ "soft_deadline": 1600000590.0
},
"realm": {
"name": "project:try"
@@ -2432,7 +2327,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000670.0
+ "soft_deadline": 1600000610.0
},
"realm": {
"name": "project:try"
@@ -2460,41 +2355,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000690.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*/*.log",
"--hidden"
],
@@ -2502,7 +2362,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000710.0
+ "soft_deadline": 1600000630.0
},
"realm": {
"name": "project:try"
@@ -2537,7 +2397,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000730.0
+ "soft_deadline": 1600000650.0
},
"realm": {
"name": "project:try"
@@ -2565,6 +2425,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000670.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000690.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
"*_log",
"--hidden"
],
@@ -2572,6 +2502,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1600000710.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000730.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1600000750.0
},
"realm": {
@@ -2585,7 +2585,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.*_log",
+ "name": "step1.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -2635,7 +2635,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -2655,7 +2655,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step1.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -3396,111 +3396,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000850.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000870.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000890.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
"*.bat",
"--hidden"
],
@@ -3508,7 +3403,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000910.0
+ "soft_deadline": 1600000850.0
},
"realm": {
"name": "project:try"
@@ -3543,7 +3438,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000930.0
+ "soft_deadline": 1600000870.0
},
"realm": {
"name": "project:try"
@@ -3578,7 +3473,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000950.0
+ "soft_deadline": 1600000890.0
},
"realm": {
"name": "project:try"
@@ -3613,7 +3508,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000970.0
+ "soft_deadline": 1600000910.0
},
"realm": {
"name": "project:try"
@@ -3648,7 +3543,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000990.0
+ "soft_deadline": 1600000930.0
},
"realm": {
"name": "project:try"
@@ -3683,7 +3578,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001010.0
+ "soft_deadline": 1600000950.0
},
"realm": {
"name": "project:try"
@@ -3725,7 +3620,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001030.0
+ "soft_deadline": 1600000970.0
},
"realm": {
"name": "project:try"
@@ -3760,7 +3655,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001050.0
+ "soft_deadline": 1600000990.0
},
"realm": {
"name": "project:try"
@@ -3795,7 +3690,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001070.0
+ "soft_deadline": 1600001010.0
},
"realm": {
"name": "project:try"
@@ -3830,7 +3725,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001090.0
+ "soft_deadline": 1600001030.0
},
"realm": {
"name": "project:try"
@@ -3865,7 +3760,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001110.0
+ "soft_deadline": 1600001050.0
},
"realm": {
"name": "project:try"
@@ -3900,7 +3795,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001130.0
+ "soft_deadline": 1600001070.0
},
"realm": {
"name": "project:try"
@@ -3928,41 +3823,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600001150.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
"*/*.log",
"--hidden"
],
@@ -3970,7 +3830,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001170.0
+ "soft_deadline": 1600001090.0
},
"realm": {
"name": "project:try"
@@ -4005,7 +3865,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001190.0
+ "soft_deadline": 1600001110.0
},
"realm": {
"name": "project:try"
@@ -4033,6 +3893,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001130.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001150.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
"*_log",
"--hidden"
],
@@ -4040,6 +3970,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1600001170.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001190.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1600001210.0
},
"realm": {
@@ -4053,7 +4053,7 @@
"hostname": "rdbhost"
}
},
- "name": "step2.logs.glob.*_log",
+ "name": "step2.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -4103,7 +4103,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -4123,7 +4123,7 @@
"hostname": "rdbhost"
}
},
- "name": "step2.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step2.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json
index 98dfa53..4c7ac15 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json
@@ -1765,111 +1765,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000390.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000410.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000430.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*.bat",
"--hidden"
],
@@ -1877,7 +1772,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000450.0
+ "soft_deadline": 1600000390.0
},
"realm": {
"name": "project:ci"
@@ -1912,7 +1807,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000470.0
+ "soft_deadline": 1600000410.0
},
"realm": {
"name": "project:ci"
@@ -1947,7 +1842,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000490.0
+ "soft_deadline": 1600000430.0
},
"realm": {
"name": "project:ci"
@@ -1982,7 +1877,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000510.0
+ "soft_deadline": 1600000450.0
},
"realm": {
"name": "project:ci"
@@ -2017,7 +1912,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000530.0
+ "soft_deadline": 1600000470.0
},
"realm": {
"name": "project:ci"
@@ -2052,7 +1947,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000550.0
+ "soft_deadline": 1600000490.0
},
"realm": {
"name": "project:ci"
@@ -2094,7 +1989,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000570.0
+ "soft_deadline": 1600000510.0
},
"realm": {
"name": "project:ci"
@@ -2129,7 +2024,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000590.0
+ "soft_deadline": 1600000530.0
},
"realm": {
"name": "project:ci"
@@ -2164,7 +2059,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000610.0
+ "soft_deadline": 1600000550.0
},
"realm": {
"name": "project:ci"
@@ -2199,7 +2094,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000630.0
+ "soft_deadline": 1600000570.0
},
"realm": {
"name": "project:ci"
@@ -2234,7 +2129,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000650.0
+ "soft_deadline": 1600000590.0
},
"realm": {
"name": "project:ci"
@@ -2269,7 +2164,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000670.0
+ "soft_deadline": 1600000610.0
},
"realm": {
"name": "project:ci"
@@ -2297,41 +2192,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000690.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*/*.log",
"--hidden"
],
@@ -2339,7 +2199,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000710.0
+ "soft_deadline": 1600000630.0
},
"realm": {
"name": "project:ci"
@@ -2374,7 +2234,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000730.0
+ "soft_deadline": 1600000650.0
},
"realm": {
"name": "project:ci"
@@ -2402,6 +2262,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000670.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000690.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
"*_log",
"--hidden"
],
@@ -2409,6 +2339,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1600000710.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000730.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1600000750.0
},
"realm": {
@@ -2422,7 +2422,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.*_log",
+ "name": "step1.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -2472,7 +2472,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -2492,7 +2492,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step1.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -3233,111 +3233,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000850.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000870.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000890.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
"*.bat",
"--hidden"
],
@@ -3345,7 +3240,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000910.0
+ "soft_deadline": 1600000850.0
},
"realm": {
"name": "project:ci"
@@ -3380,7 +3275,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000930.0
+ "soft_deadline": 1600000870.0
},
"realm": {
"name": "project:ci"
@@ -3415,7 +3310,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000950.0
+ "soft_deadline": 1600000890.0
},
"realm": {
"name": "project:ci"
@@ -3450,7 +3345,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000970.0
+ "soft_deadline": 1600000910.0
},
"realm": {
"name": "project:ci"
@@ -3485,7 +3380,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000990.0
+ "soft_deadline": 1600000930.0
},
"realm": {
"name": "project:ci"
@@ -3520,7 +3415,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001010.0
+ "soft_deadline": 1600000950.0
},
"realm": {
"name": "project:ci"
@@ -3562,7 +3457,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001030.0
+ "soft_deadline": 1600000970.0
},
"realm": {
"name": "project:ci"
@@ -3597,7 +3492,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001050.0
+ "soft_deadline": 1600000990.0
},
"realm": {
"name": "project:ci"
@@ -3632,7 +3527,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001070.0
+ "soft_deadline": 1600001010.0
},
"realm": {
"name": "project:ci"
@@ -3667,7 +3562,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001090.0
+ "soft_deadline": 1600001030.0
},
"realm": {
"name": "project:ci"
@@ -3702,7 +3597,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001110.0
+ "soft_deadline": 1600001050.0
},
"realm": {
"name": "project:ci"
@@ -3737,7 +3632,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001130.0
+ "soft_deadline": 1600001070.0
},
"realm": {
"name": "project:ci"
@@ -3765,41 +3660,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600001150.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
"*/*.log",
"--hidden"
],
@@ -3807,7 +3667,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001170.0
+ "soft_deadline": 1600001090.0
},
"realm": {
"name": "project:ci"
@@ -3842,7 +3702,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001190.0
+ "soft_deadline": 1600001110.0
},
"realm": {
"name": "project:ci"
@@ -3870,6 +3730,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001130.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001150.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
"*_log",
"--hidden"
],
@@ -3877,6 +3807,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1600001170.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001190.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1600001210.0
},
"realm": {
@@ -3890,7 +3890,7 @@
"hostname": "rdbhost"
}
},
- "name": "step2.logs.glob.*_log",
+ "name": "step2.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -3940,7 +3940,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -3960,7 +3960,7 @@
"hostname": "rdbhost"
}
},
- "name": "step2.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step2.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
index 3a8b72b..95f4774 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
@@ -1972,111 +1972,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000390.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000410.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000430.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*.bat",
"--hidden"
],
@@ -2084,7 +1979,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000450.0
+ "soft_deadline": 1600000390.0
},
"realm": {
"name": "project:try"
@@ -2119,7 +2014,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000470.0
+ "soft_deadline": 1600000410.0
},
"realm": {
"name": "project:try"
@@ -2154,7 +2049,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000490.0
+ "soft_deadline": 1600000430.0
},
"realm": {
"name": "project:try"
@@ -2189,7 +2084,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000510.0
+ "soft_deadline": 1600000450.0
},
"realm": {
"name": "project:try"
@@ -2224,7 +2119,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000530.0
+ "soft_deadline": 1600000470.0
},
"realm": {
"name": "project:try"
@@ -2259,7 +2154,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000550.0
+ "soft_deadline": 1600000490.0
},
"realm": {
"name": "project:try"
@@ -2301,7 +2196,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000570.0
+ "soft_deadline": 1600000510.0
},
"realm": {
"name": "project:try"
@@ -2336,7 +2231,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000590.0
+ "soft_deadline": 1600000530.0
},
"realm": {
"name": "project:try"
@@ -2371,7 +2266,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000610.0
+ "soft_deadline": 1600000550.0
},
"realm": {
"name": "project:try"
@@ -2406,7 +2301,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000630.0
+ "soft_deadline": 1600000570.0
},
"realm": {
"name": "project:try"
@@ -2441,7 +2336,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000650.0
+ "soft_deadline": 1600000590.0
},
"realm": {
"name": "project:try"
@@ -2476,7 +2371,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000670.0
+ "soft_deadline": 1600000610.0
},
"realm": {
"name": "project:try"
@@ -2504,41 +2399,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000690.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*/*.log",
"--hidden"
],
@@ -2546,7 +2406,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000710.0
+ "soft_deadline": 1600000630.0
},
"realm": {
"name": "project:try"
@@ -2581,7 +2441,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000730.0
+ "soft_deadline": 1600000650.0
},
"realm": {
"name": "project:try"
@@ -2609,6 +2469,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000670.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000690.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
"*_log",
"--hidden"
],
@@ -2616,6 +2546,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1600000710.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000730.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1600000750.0
},
"realm": {
@@ -2629,7 +2629,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.*_log",
+ "name": "step1.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -2679,7 +2679,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -2699,7 +2699,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step1.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -3484,111 +3484,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000850.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000870.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000890.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
"*.bat",
"--hidden"
],
@@ -3596,7 +3491,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000910.0
+ "soft_deadline": 1600000850.0
},
"realm": {
"name": "project:try"
@@ -3631,7 +3526,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000930.0
+ "soft_deadline": 1600000870.0
},
"realm": {
"name": "project:try"
@@ -3666,7 +3561,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000950.0
+ "soft_deadline": 1600000890.0
},
"realm": {
"name": "project:try"
@@ -3701,7 +3596,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000970.0
+ "soft_deadline": 1600000910.0
},
"realm": {
"name": "project:try"
@@ -3736,7 +3631,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000990.0
+ "soft_deadline": 1600000930.0
},
"realm": {
"name": "project:try"
@@ -3771,7 +3666,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001010.0
+ "soft_deadline": 1600000950.0
},
"realm": {
"name": "project:try"
@@ -3813,7 +3708,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001030.0
+ "soft_deadline": 1600000970.0
},
"realm": {
"name": "project:try"
@@ -3848,7 +3743,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001050.0
+ "soft_deadline": 1600000990.0
},
"realm": {
"name": "project:try"
@@ -3883,7 +3778,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001070.0
+ "soft_deadline": 1600001010.0
},
"realm": {
"name": "project:try"
@@ -3918,7 +3813,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001090.0
+ "soft_deadline": 1600001030.0
},
"realm": {
"name": "project:try"
@@ -3953,7 +3848,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001110.0
+ "soft_deadline": 1600001050.0
},
"realm": {
"name": "project:try"
@@ -3988,7 +3883,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001130.0
+ "soft_deadline": 1600001070.0
},
"realm": {
"name": "project:try"
@@ -4016,41 +3911,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600001150.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
"*/*.log",
"--hidden"
],
@@ -4058,7 +3918,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001170.0
+ "soft_deadline": 1600001090.0
},
"realm": {
"name": "project:try"
@@ -4093,7 +3953,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001190.0
+ "soft_deadline": 1600001110.0
},
"realm": {
"name": "project:try"
@@ -4121,6 +3981,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001130.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001150.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
"*_log",
"--hidden"
],
@@ -4128,6 +4058,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1600001170.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001190.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1600001210.0
},
"realm": {
@@ -4141,7 +4141,7 @@
"hostname": "rdbhost"
}
},
- "name": "step2.logs.glob.*_log",
+ "name": "step2.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -4191,7 +4191,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -4211,7 +4211,7 @@
"hostname": "rdbhost"
}
},
- "name": "step2.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step2.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json
index b82df3e..0eb66c5 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json
@@ -1928,111 +1928,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000390.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000410.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000430.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*.bat",
"--hidden"
],
@@ -2040,7 +1935,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000450.0
+ "soft_deadline": 1600000390.0
},
"realm": {
"name": "project:try"
@@ -2075,7 +1970,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000470.0
+ "soft_deadline": 1600000410.0
},
"realm": {
"name": "project:try"
@@ -2110,7 +2005,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000490.0
+ "soft_deadline": 1600000430.0
},
"realm": {
"name": "project:try"
@@ -2145,7 +2040,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000510.0
+ "soft_deadline": 1600000450.0
},
"realm": {
"name": "project:try"
@@ -2180,7 +2075,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000530.0
+ "soft_deadline": 1600000470.0
},
"realm": {
"name": "project:try"
@@ -2215,7 +2110,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000550.0
+ "soft_deadline": 1600000490.0
},
"realm": {
"name": "project:try"
@@ -2257,7 +2152,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000570.0
+ "soft_deadline": 1600000510.0
},
"realm": {
"name": "project:try"
@@ -2292,7 +2187,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000590.0
+ "soft_deadline": 1600000530.0
},
"realm": {
"name": "project:try"
@@ -2327,7 +2222,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000610.0
+ "soft_deadline": 1600000550.0
},
"realm": {
"name": "project:try"
@@ -2362,7 +2257,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000630.0
+ "soft_deadline": 1600000570.0
},
"realm": {
"name": "project:try"
@@ -2397,7 +2292,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000650.0
+ "soft_deadline": 1600000590.0
},
"realm": {
"name": "project:try"
@@ -2432,7 +2327,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000670.0
+ "soft_deadline": 1600000610.0
},
"realm": {
"name": "project:try"
@@ -2460,41 +2355,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000690.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*/*.log",
"--hidden"
],
@@ -2502,7 +2362,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000710.0
+ "soft_deadline": 1600000630.0
},
"realm": {
"name": "project:try"
@@ -2537,7 +2397,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000730.0
+ "soft_deadline": 1600000650.0
},
"realm": {
"name": "project:try"
@@ -2565,6 +2425,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000670.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000690.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
"*_log",
"--hidden"
],
@@ -2572,6 +2502,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1600000710.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000730.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1600000750.0
},
"realm": {
@@ -2585,7 +2585,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.*_log",
+ "name": "step1.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -2635,7 +2635,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -2655,7 +2655,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step1.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -3396,111 +3396,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000850.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000870.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000890.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
"*.bat",
"--hidden"
],
@@ -3508,7 +3403,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000910.0
+ "soft_deadline": 1600000850.0
},
"realm": {
"name": "project:try"
@@ -3543,7 +3438,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000930.0
+ "soft_deadline": 1600000870.0
},
"realm": {
"name": "project:try"
@@ -3578,7 +3473,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000950.0
+ "soft_deadline": 1600000890.0
},
"realm": {
"name": "project:try"
@@ -3613,7 +3508,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000970.0
+ "soft_deadline": 1600000910.0
},
"realm": {
"name": "project:try"
@@ -3648,7 +3543,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000990.0
+ "soft_deadline": 1600000930.0
},
"realm": {
"name": "project:try"
@@ -3683,7 +3578,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001010.0
+ "soft_deadline": 1600000950.0
},
"realm": {
"name": "project:try"
@@ -3725,7 +3620,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001030.0
+ "soft_deadline": 1600000970.0
},
"realm": {
"name": "project:try"
@@ -3760,7 +3655,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001050.0
+ "soft_deadline": 1600000990.0
},
"realm": {
"name": "project:try"
@@ -3795,7 +3690,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001070.0
+ "soft_deadline": 1600001010.0
},
"realm": {
"name": "project:try"
@@ -3830,7 +3725,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001090.0
+ "soft_deadline": 1600001030.0
},
"realm": {
"name": "project:try"
@@ -3865,7 +3760,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001110.0
+ "soft_deadline": 1600001050.0
},
"realm": {
"name": "project:try"
@@ -3900,7 +3795,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001130.0
+ "soft_deadline": 1600001070.0
},
"realm": {
"name": "project:try"
@@ -3928,41 +3823,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600001150.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
"*/*.log",
"--hidden"
],
@@ -3970,7 +3830,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001170.0
+ "soft_deadline": 1600001090.0
},
"realm": {
"name": "project:try"
@@ -4005,7 +3865,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001190.0
+ "soft_deadline": 1600001110.0
},
"realm": {
"name": "project:try"
@@ -4033,6 +3893,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001130.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001150.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
"*_log",
"--hidden"
],
@@ -4040,6 +3970,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1600001170.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001190.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1600001210.0
},
"realm": {
@@ -4053,7 +4053,7 @@
"hostname": "rdbhost"
}
},
- "name": "step2.logs.glob.*_log",
+ "name": "step2.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -4103,7 +4103,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -4123,7 +4123,7 @@
"hostname": "rdbhost"
}
},
- "name": "step2.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step2.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/long.json b/recipe_modules/pw_presubmit/tests/full.expected/long.json
index 00ac06c..9154764 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/long.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/long.json
@@ -1920,111 +1920,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000390.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000410.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000430.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*.bat",
"--hidden"
],
@@ -2032,7 +1927,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000450.0
+ "soft_deadline": 1600000390.0
},
"realm": {
"name": "project:try"
@@ -2067,7 +1962,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000470.0
+ "soft_deadline": 1600000410.0
},
"realm": {
"name": "project:try"
@@ -2102,7 +1997,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000490.0
+ "soft_deadline": 1600000430.0
},
"realm": {
"name": "project:try"
@@ -2137,7 +2032,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000510.0
+ "soft_deadline": 1600000450.0
},
"realm": {
"name": "project:try"
@@ -2172,7 +2067,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000530.0
+ "soft_deadline": 1600000470.0
},
"realm": {
"name": "project:try"
@@ -2207,7 +2102,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000550.0
+ "soft_deadline": 1600000490.0
},
"realm": {
"name": "project:try"
@@ -2249,7 +2144,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000570.0
+ "soft_deadline": 1600000510.0
},
"realm": {
"name": "project:try"
@@ -2284,7 +2179,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000590.0
+ "soft_deadline": 1600000530.0
},
"realm": {
"name": "project:try"
@@ -2319,7 +2214,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000610.0
+ "soft_deadline": 1600000550.0
},
"realm": {
"name": "project:try"
@@ -2354,7 +2249,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000630.0
+ "soft_deadline": 1600000570.0
},
"realm": {
"name": "project:try"
@@ -2389,7 +2284,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000650.0
+ "soft_deadline": 1600000590.0
},
"realm": {
"name": "project:try"
@@ -2424,7 +2319,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000670.0
+ "soft_deadline": 1600000610.0
},
"realm": {
"name": "project:try"
@@ -2452,41 +2347,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000690.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*/*.log",
"--hidden"
],
@@ -2494,7 +2354,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000710.0
+ "soft_deadline": 1600000630.0
},
"realm": {
"name": "project:try"
@@ -2529,7 +2389,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000730.0
+ "soft_deadline": 1600000650.0
},
"realm": {
"name": "project:try"
@@ -2557,6 +2417,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000670.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000690.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
"*_log",
"--hidden"
],
@@ -2564,6 +2494,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1600000710.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000730.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1600000750.0
},
"realm": {
@@ -2577,7 +2577,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.*_log",
+ "name": "step1.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -2627,7 +2627,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -2647,7 +2647,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step1.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -3380,111 +3380,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000850.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000870.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000890.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
"*.bat",
"--hidden"
],
@@ -3492,7 +3387,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000910.0
+ "soft_deadline": 1600000850.0
},
"realm": {
"name": "project:try"
@@ -3527,7 +3422,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000930.0
+ "soft_deadline": 1600000870.0
},
"realm": {
"name": "project:try"
@@ -3562,7 +3457,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000950.0
+ "soft_deadline": 1600000890.0
},
"realm": {
"name": "project:try"
@@ -3597,7 +3492,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000970.0
+ "soft_deadline": 1600000910.0
},
"realm": {
"name": "project:try"
@@ -3632,7 +3527,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000990.0
+ "soft_deadline": 1600000930.0
},
"realm": {
"name": "project:try"
@@ -3667,7 +3562,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001010.0
+ "soft_deadline": 1600000950.0
},
"realm": {
"name": "project:try"
@@ -3709,7 +3604,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001030.0
+ "soft_deadline": 1600000970.0
},
"realm": {
"name": "project:try"
@@ -3744,7 +3639,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001050.0
+ "soft_deadline": 1600000990.0
},
"realm": {
"name": "project:try"
@@ -3779,7 +3674,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001070.0
+ "soft_deadline": 1600001010.0
},
"realm": {
"name": "project:try"
@@ -3814,7 +3709,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001090.0
+ "soft_deadline": 1600001030.0
},
"realm": {
"name": "project:try"
@@ -3849,7 +3744,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001110.0
+ "soft_deadline": 1600001050.0
},
"realm": {
"name": "project:try"
@@ -3884,7 +3779,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001130.0
+ "soft_deadline": 1600001070.0
},
"realm": {
"name": "project:try"
@@ -3912,41 +3807,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600001150.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
"*/*.log",
"--hidden"
],
@@ -3954,7 +3814,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001170.0
+ "soft_deadline": 1600001090.0
},
"realm": {
"name": "project:try"
@@ -3989,7 +3849,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001190.0
+ "soft_deadline": 1600001110.0
},
"realm": {
"name": "project:try"
@@ -4017,6 +3877,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001130.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001150.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
"*_log",
"--hidden"
],
@@ -4024,6 +3954,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1600001170.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001190.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1600001210.0
},
"realm": {
@@ -4037,7 +4037,7 @@
"hostname": "rdbhost"
}
},
- "name": "step2.logs.glob.*_log",
+ "name": "step2.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -4087,7 +4087,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -4107,7 +4107,7 @@
"hostname": "rdbhost"
}
},
- "name": "step2.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step2.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/medium.json b/recipe_modules/pw_presubmit/tests/full.expected/medium.json
index 3743099..cce9968 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/medium.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/medium.json
@@ -1920,111 +1920,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000390.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000410.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000430.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*.bat",
"--hidden"
],
@@ -2032,7 +1927,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000450.0
+ "soft_deadline": 1600000390.0
},
"realm": {
"name": "project:try"
@@ -2067,7 +1962,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000470.0
+ "soft_deadline": 1600000410.0
},
"realm": {
"name": "project:try"
@@ -2102,7 +1997,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000490.0
+ "soft_deadline": 1600000430.0
},
"realm": {
"name": "project:try"
@@ -2137,7 +2032,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000510.0
+ "soft_deadline": 1600000450.0
},
"realm": {
"name": "project:try"
@@ -2172,7 +2067,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000530.0
+ "soft_deadline": 1600000470.0
},
"realm": {
"name": "project:try"
@@ -2207,7 +2102,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000550.0
+ "soft_deadline": 1600000490.0
},
"realm": {
"name": "project:try"
@@ -2249,7 +2144,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000570.0
+ "soft_deadline": 1600000510.0
},
"realm": {
"name": "project:try"
@@ -2284,7 +2179,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000590.0
+ "soft_deadline": 1600000530.0
},
"realm": {
"name": "project:try"
@@ -2319,7 +2214,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000610.0
+ "soft_deadline": 1600000550.0
},
"realm": {
"name": "project:try"
@@ -2354,7 +2249,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000630.0
+ "soft_deadline": 1600000570.0
},
"realm": {
"name": "project:try"
@@ -2389,7 +2284,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000650.0
+ "soft_deadline": 1600000590.0
},
"realm": {
"name": "project:try"
@@ -2424,7 +2319,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000670.0
+ "soft_deadline": 1600000610.0
},
"realm": {
"name": "project:try"
@@ -2452,41 +2347,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000690.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*/*.log",
"--hidden"
],
@@ -2494,7 +2354,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000710.0
+ "soft_deadline": 1600000630.0
},
"realm": {
"name": "project:try"
@@ -2529,7 +2389,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000730.0
+ "soft_deadline": 1600000650.0
},
"realm": {
"name": "project:try"
@@ -2557,6 +2417,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000670.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000690.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
"*_log",
"--hidden"
],
@@ -2564,6 +2494,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1600000710.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000730.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1600000750.0
},
"realm": {
@@ -2577,7 +2577,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.*_log",
+ "name": "step1.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -2627,7 +2627,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -2647,7 +2647,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step1.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -3380,111 +3380,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000850.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000870.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000890.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
"*.bat",
"--hidden"
],
@@ -3492,7 +3387,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000910.0
+ "soft_deadline": 1600000850.0
},
"realm": {
"name": "project:try"
@@ -3527,7 +3422,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000930.0
+ "soft_deadline": 1600000870.0
},
"realm": {
"name": "project:try"
@@ -3562,7 +3457,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000950.0
+ "soft_deadline": 1600000890.0
},
"realm": {
"name": "project:try"
@@ -3597,7 +3492,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000970.0
+ "soft_deadline": 1600000910.0
},
"realm": {
"name": "project:try"
@@ -3632,7 +3527,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000990.0
+ "soft_deadline": 1600000930.0
},
"realm": {
"name": "project:try"
@@ -3667,7 +3562,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001010.0
+ "soft_deadline": 1600000950.0
},
"realm": {
"name": "project:try"
@@ -3709,7 +3604,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001030.0
+ "soft_deadline": 1600000970.0
},
"realm": {
"name": "project:try"
@@ -3744,7 +3639,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001050.0
+ "soft_deadline": 1600000990.0
},
"realm": {
"name": "project:try"
@@ -3779,7 +3674,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001070.0
+ "soft_deadline": 1600001010.0
},
"realm": {
"name": "project:try"
@@ -3814,7 +3709,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001090.0
+ "soft_deadline": 1600001030.0
},
"realm": {
"name": "project:try"
@@ -3849,7 +3744,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001110.0
+ "soft_deadline": 1600001050.0
},
"realm": {
"name": "project:try"
@@ -3884,7 +3779,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001130.0
+ "soft_deadline": 1600001070.0
},
"realm": {
"name": "project:try"
@@ -3912,41 +3807,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600001150.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
"*/*.log",
"--hidden"
],
@@ -3954,7 +3814,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001170.0
+ "soft_deadline": 1600001090.0
},
"realm": {
"name": "project:try"
@@ -3989,7 +3849,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001190.0
+ "soft_deadline": 1600001110.0
},
"realm": {
"name": "project:try"
@@ -4017,6 +3877,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001130.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001150.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
"*_log",
"--hidden"
],
@@ -4024,6 +3954,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1600001170.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001190.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1600001210.0
},
"realm": {
@@ -4037,7 +4037,7 @@
"hostname": "rdbhost"
}
},
- "name": "step2.logs.glob.*_log",
+ "name": "step2.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -4087,7 +4087,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -4107,7 +4107,7 @@
"hostname": "rdbhost"
}
},
- "name": "step2.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step2.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json b/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json
index 4a093f6..66a6523 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json
@@ -1755,111 +1755,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/full_0",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000057.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "full_0.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/full_0",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000058.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "full_0.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/full_0",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000060.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "full_0.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/full_0",
"*.bat",
"--hidden"
],
@@ -1867,7 +1762,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000061.5
+ "soft_deadline": 1337000057.0
},
"realm": {
"name": "project:ci"
@@ -1902,7 +1797,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000063.0
+ "soft_deadline": 1337000058.5
},
"realm": {
"name": "project:ci"
@@ -1937,7 +1832,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000064.5
+ "soft_deadline": 1337000060.0
},
"realm": {
"name": "project:ci"
@@ -1972,7 +1867,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000066.0
+ "soft_deadline": 1337000061.5
},
"realm": {
"name": "project:ci"
@@ -2007,7 +1902,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000067.5
+ "soft_deadline": 1337000063.0
},
"realm": {
"name": "project:ci"
@@ -2042,7 +1937,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000069.0
+ "soft_deadline": 1337000064.5
},
"realm": {
"name": "project:ci"
@@ -2084,7 +1979,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000070.5
+ "soft_deadline": 1337000066.0
},
"realm": {
"name": "project:ci"
@@ -2119,7 +2014,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000072.0
+ "soft_deadline": 1337000067.5
},
"realm": {
"name": "project:ci"
@@ -2154,7 +2049,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000073.5
+ "soft_deadline": 1337000069.0
},
"realm": {
"name": "project:ci"
@@ -2189,7 +2084,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000075.0
+ "soft_deadline": 1337000070.5
},
"realm": {
"name": "project:ci"
@@ -2224,7 +2119,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000076.5
+ "soft_deadline": 1337000072.0
},
"realm": {
"name": "project:ci"
@@ -2259,7 +2154,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000078.0
+ "soft_deadline": 1337000073.5
},
"realm": {
"name": "project:ci"
@@ -2287,41 +2182,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/full_0",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000079.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "full_0.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/full_0",
"*/*.log",
"--hidden"
],
@@ -2329,7 +2189,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000081.0
+ "soft_deadline": 1337000075.0
},
"realm": {
"name": "project:ci"
@@ -2364,7 +2224,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000082.5
+ "soft_deadline": 1337000076.5
},
"realm": {
"name": "project:ci"
@@ -2392,6 +2252,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/full_0",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000078.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "full_0.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/full_0",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000079.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "full_0.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/full_0",
"*_log",
"--hidden"
],
@@ -2399,6 +2329,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1337000081.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "full_0.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/full_0",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000082.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "full_0.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/full_0",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1337000084.0
},
"realm": {
@@ -2412,7 +2412,7 @@
"hostname": "rdbhost"
}
},
- "name": "full_0.logs.glob.*_log",
+ "name": "full_0.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -2462,7 +2462,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/full_0",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -2482,7 +2482,7 @@
"hostname": "rdbhost"
}
},
- "name": "full_0.logs.glob.coverage_reports/*.tar.gz",
+ "name": "full_0.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -3215,111 +3215,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/full_1",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000091.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "full_1.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/full_1",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000093.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "full_1.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/full_1",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000094.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "full_1.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/full_1",
"*.bat",
"--hidden"
],
@@ -3327,7 +3222,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000096.0
+ "soft_deadline": 1337000091.5
},
"realm": {
"name": "project:ci"
@@ -3362,7 +3257,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000097.5
+ "soft_deadline": 1337000093.0
},
"realm": {
"name": "project:ci"
@@ -3397,7 +3292,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000099.0
+ "soft_deadline": 1337000094.5
},
"realm": {
"name": "project:ci"
@@ -3432,7 +3327,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000100.5
+ "soft_deadline": 1337000096.0
},
"realm": {
"name": "project:ci"
@@ -3467,7 +3362,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000102.0
+ "soft_deadline": 1337000097.5
},
"realm": {
"name": "project:ci"
@@ -3502,7 +3397,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000103.5
+ "soft_deadline": 1337000099.0
},
"realm": {
"name": "project:ci"
@@ -3544,7 +3439,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000105.0
+ "soft_deadline": 1337000100.5
},
"realm": {
"name": "project:ci"
@@ -3579,7 +3474,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000106.5
+ "soft_deadline": 1337000102.0
},
"realm": {
"name": "project:ci"
@@ -3614,7 +3509,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000108.0
+ "soft_deadline": 1337000103.5
},
"realm": {
"name": "project:ci"
@@ -3649,7 +3544,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000109.5
+ "soft_deadline": 1337000105.0
},
"realm": {
"name": "project:ci"
@@ -3684,7 +3579,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000111.0
+ "soft_deadline": 1337000106.5
},
"realm": {
"name": "project:ci"
@@ -3719,7 +3614,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000112.5
+ "soft_deadline": 1337000108.0
},
"realm": {
"name": "project:ci"
@@ -3747,41 +3642,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/full_1",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000114.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "full_1.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/full_1",
"*/*.log",
"--hidden"
],
@@ -3789,7 +3649,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000115.5
+ "soft_deadline": 1337000109.5
},
"realm": {
"name": "project:ci"
@@ -3824,7 +3684,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000117.0
+ "soft_deadline": 1337000111.0
},
"realm": {
"name": "project:ci"
@@ -3852,6 +3712,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/full_1",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000112.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "full_1.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/full_1",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000114.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "full_1.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/full_1",
"*_log",
"--hidden"
],
@@ -3859,6 +3789,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1337000115.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "full_1.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/full_1",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000117.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "full_1.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/full_1",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1337000118.5
},
"realm": {
@@ -3872,7 +3872,7 @@
"hostname": "rdbhost"
}
},
- "name": "full_1.logs.glob.*_log",
+ "name": "full_1.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -3922,7 +3922,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/full_1",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -3942,7 +3942,7 @@
"hostname": "rdbhost"
}
},
- "name": "full_1.logs.glob.coverage_reports/*.tar.gz",
+ "name": "full_1.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/step.json b/recipe_modules/pw_presubmit/tests/full.expected/step.json
index 835932f..18a0991 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/step.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/step.json
@@ -1928,111 +1928,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000390.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000410.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000430.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*.bat",
"--hidden"
],
@@ -2040,7 +1935,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000450.0
+ "soft_deadline": 1600000390.0
},
"realm": {
"name": "project:try"
@@ -2075,7 +1970,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000470.0
+ "soft_deadline": 1600000410.0
},
"realm": {
"name": "project:try"
@@ -2110,7 +2005,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000490.0
+ "soft_deadline": 1600000430.0
},
"realm": {
"name": "project:try"
@@ -2145,7 +2040,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000510.0
+ "soft_deadline": 1600000450.0
},
"realm": {
"name": "project:try"
@@ -2180,7 +2075,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000530.0
+ "soft_deadline": 1600000470.0
},
"realm": {
"name": "project:try"
@@ -2215,7 +2110,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000550.0
+ "soft_deadline": 1600000490.0
},
"realm": {
"name": "project:try"
@@ -2257,7 +2152,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000570.0
+ "soft_deadline": 1600000510.0
},
"realm": {
"name": "project:try"
@@ -2292,7 +2187,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000590.0
+ "soft_deadline": 1600000530.0
},
"realm": {
"name": "project:try"
@@ -2327,7 +2222,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000610.0
+ "soft_deadline": 1600000550.0
},
"realm": {
"name": "project:try"
@@ -2362,7 +2257,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000630.0
+ "soft_deadline": 1600000570.0
},
"realm": {
"name": "project:try"
@@ -2397,7 +2292,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000650.0
+ "soft_deadline": 1600000590.0
},
"realm": {
"name": "project:try"
@@ -2432,7 +2327,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000670.0
+ "soft_deadline": 1600000610.0
},
"realm": {
"name": "project:try"
@@ -2460,41 +2355,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000690.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step1.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step1",
"*/*.log",
"--hidden"
],
@@ -2502,7 +2362,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000710.0
+ "soft_deadline": 1600000630.0
},
"realm": {
"name": "project:try"
@@ -2537,7 +2397,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000730.0
+ "soft_deadline": 1600000650.0
},
"realm": {
"name": "project:try"
@@ -2565,6 +2425,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000670.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000690.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
"*_log",
"--hidden"
],
@@ -2572,6 +2502,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1600000710.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600000730.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step1.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step1",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1600000750.0
},
"realm": {
@@ -2585,7 +2585,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.*_log",
+ "name": "step1.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -2635,7 +2635,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step1",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -2655,7 +2655,7 @@
"hostname": "rdbhost"
}
},
- "name": "step1.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step1.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -3394,111 +3394,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000850.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000870.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600000890.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
"*.bat",
"--hidden"
],
@@ -3506,7 +3401,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000910.0
+ "soft_deadline": 1600000850.0
},
"realm": {
"name": "project:try"
@@ -3541,7 +3436,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000930.0
+ "soft_deadline": 1600000870.0
},
"realm": {
"name": "project:try"
@@ -3576,7 +3471,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000950.0
+ "soft_deadline": 1600000890.0
},
"realm": {
"name": "project:try"
@@ -3611,7 +3506,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000970.0
+ "soft_deadline": 1600000910.0
},
"realm": {
"name": "project:try"
@@ -3646,7 +3541,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600000990.0
+ "soft_deadline": 1600000930.0
},
"realm": {
"name": "project:try"
@@ -3681,7 +3576,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001010.0
+ "soft_deadline": 1600000950.0
},
"realm": {
"name": "project:try"
@@ -3723,7 +3618,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001030.0
+ "soft_deadline": 1600000970.0
},
"realm": {
"name": "project:try"
@@ -3758,7 +3653,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001050.0
+ "soft_deadline": 1600000990.0
},
"realm": {
"name": "project:try"
@@ -3793,7 +3688,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001070.0
+ "soft_deadline": 1600001010.0
},
"realm": {
"name": "project:try"
@@ -3828,7 +3723,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001090.0
+ "soft_deadline": 1600001030.0
},
"realm": {
"name": "project:try"
@@ -3863,7 +3758,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001110.0
+ "soft_deadline": 1600001050.0
},
"realm": {
"name": "project:try"
@@ -3898,7 +3793,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001130.0
+ "soft_deadline": 1600001070.0
},
"realm": {
"name": "project:try"
@@ -3926,41 +3821,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1600001150.0
- },
- "realm": {
- "name": "project:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "step2.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/step2",
"*/*.log",
"--hidden"
],
@@ -3968,7 +3828,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001170.0
+ "soft_deadline": 1600001090.0
},
"realm": {
"name": "project:try"
@@ -4003,7 +3863,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1600001190.0
+ "soft_deadline": 1600001110.0
},
"realm": {
"name": "project:try"
@@ -4031,6 +3891,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001130.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001150.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
"*_log",
"--hidden"
],
@@ -4038,6 +3968,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1600001170.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1600001190.0
+ },
+ "realm": {
+ "name": "project:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "step2.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/step2",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1600001210.0
},
"realm": {
@@ -4051,7 +4051,7 @@
"hostname": "rdbhost"
}
},
- "name": "step2.logs.glob.*_log",
+ "name": "step2.logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -4101,7 +4101,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/step2",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -4121,7 +4121,7 @@
"hostname": "rdbhost"
}
},
- "name": "step2.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step2.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/substep.json b/recipe_modules/pw_presubmit/tests/full.expected/substep.json
index ec54c07..99d6a57 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/substep.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/substep.json
@@ -1181,81 +1181,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/composite",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000060.0
- }
- },
- "name": "composite.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/composite",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000061.5
- }
- },
- "name": "composite.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/composite",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000063.0
- }
- },
- "name": "composite.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/composite",
"*.bat",
"--hidden"
],
@@ -1263,7 +1188,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000064.5
+ "soft_deadline": 1337000060.0
}
},
"name": "composite.logs.glob.*.bat",
@@ -1288,7 +1213,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000066.0
+ "soft_deadline": 1337000061.5
}
},
"name": "composite.logs.glob.*.compdb",
@@ -1313,7 +1238,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000067.5
+ "soft_deadline": 1337000063.0
}
},
"name": "composite.logs.glob.*.gn",
@@ -1338,7 +1263,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000069.0
+ "soft_deadline": 1337000064.5
}
},
"name": "composite.logs.glob.*.graph",
@@ -1363,7 +1288,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000070.5
+ "soft_deadline": 1337000066.0
}
},
"name": "composite.logs.glob.*.json",
@@ -1388,7 +1313,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000072.0
+ "soft_deadline": 1337000067.5
}
},
"name": "composite.logs.glob.*.log",
@@ -1420,7 +1345,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000073.5
+ "soft_deadline": 1337000069.0
}
},
"name": "composite.logs.glob.*.sh",
@@ -1445,7 +1370,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000075.0
+ "soft_deadline": 1337000070.5
}
},
"name": "composite.logs.glob.*.stderr",
@@ -1470,7 +1395,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000076.5
+ "soft_deadline": 1337000072.0
}
},
"name": "composite.logs.glob.*.stdout",
@@ -1495,7 +1420,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000078.0
+ "soft_deadline": 1337000073.5
}
},
"name": "composite.logs.glob.*.txt",
@@ -1520,7 +1445,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000079.5
+ "soft_deadline": 1337000075.0
}
},
"name": "composite.logs.glob.*/*.cfg",
@@ -1545,7 +1470,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000081.0
+ "soft_deadline": 1337000076.5
}
},
"name": "composite.logs.glob.*/*.ensure",
@@ -1563,31 +1488,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/composite",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000082.5
- }
- },
- "name": "composite.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout/p/composite",
"*/*.log",
"--hidden"
],
@@ -1595,7 +1495,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000084.0
+ "soft_deadline": 1337000078.0
}
},
"name": "composite.logs.glob.*/*.log",
@@ -1620,7 +1520,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000085.5
+ "soft_deadline": 1337000079.5
}
},
"name": "composite.logs.glob.*/*.txt",
@@ -1638,6 +1538,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/composite",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000081.0
+ }
+ },
+ "name": "composite.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/composite",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000082.5
+ }
+ },
+ "name": "composite.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/composite",
"*_log",
"--hidden"
],
@@ -1645,7 +1595,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000087.0
+ "soft_deadline": 1337000084.0
}
},
"name": "composite.logs.glob.*_log",
@@ -1663,6 +1613,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/composite",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000085.5
+ }
+ },
+ "name": "composite.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/composite",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000087.0
+ }
+ },
+ "name": "composite.logs.glob.coverage_reports/*.tar.gz",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout/p/composite",
"pigweed_environment.gni",
"--hidden"
],
@@ -1688,7 +1688,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout/p/composite",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -1698,7 +1698,7 @@
"soft_deadline": 1337000090.0
}
},
- "name": "composite.logs.glob.coverage_reports/*.tar.gz",
+ "name": "composite.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipe_modules/save_logs/api.py b/recipe_modules/save_logs/api.py
index 28954af..7292617 100644
--- a/recipe_modules/save_logs/api.py
+++ b/recipe_modules/save_logs/api.py
@@ -48,9 +48,6 @@
"""
globs: list[str] = [
- 'pip_install_log.txt',
- '*/pip_install_log.txt',
- '*/*/pip_install_log.txt',
'*.bat',
'*.compdb',
'*.gn',
@@ -63,12 +60,15 @@
'*.txt',
'*/*.cfg',
'*/*.ensure',
- '*/*.json',
'*/*.log',
'*/*.txt',
+ '*/*/pip_install_log.txt',
+ '*/pip_install_log.txt',
'*_log',
- 'pigweed_environment.gni',
+ 'cipd/*.json',
'coverage_reports/*.tar.gz',
+ 'pigweed_environment.gni',
+ 'pip_install_log.txt',
]
self.m.path.mock_add_file(dirs[0] / '.ninja_log')
self.m.path.mock_add_file(dirs[0] / 'coverage_reports' / 'foo.tar.gz')
diff --git a/recipe_modules/save_logs/tests/full.expected/full.json b/recipe_modules/save_logs/tests/full.expected/full.json
index 624690a..9f002bf 100644
--- a/recipe_modules/save_logs/tests/full.expected/full.json
+++ b/recipe_modules/save_logs/tests/full.expected/full.json
@@ -31,81 +31,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000031.5
- }
- },
- "name": "save logs.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000033.0
- }
- },
- "name": "save logs.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000034.5
- }
- },
- "name": "save logs.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout",
"*.bat",
"--hidden"
],
@@ -113,7 +38,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000036.0
+ "soft_deadline": 1337000031.5
}
},
"name": "save logs.logs.glob.*.bat",
@@ -138,7 +63,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000037.5
+ "soft_deadline": 1337000033.0
}
},
"name": "save logs.logs.glob.*.compdb",
@@ -163,7 +88,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000039.0
+ "soft_deadline": 1337000034.5
}
},
"name": "save logs.logs.glob.*.gn",
@@ -188,7 +113,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000040.5
+ "soft_deadline": 1337000036.0
}
},
"name": "save logs.logs.glob.*.graph",
@@ -213,7 +138,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000042.0
+ "soft_deadline": 1337000037.5
}
},
"name": "save logs.logs.glob.*.json",
@@ -238,7 +163,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000043.5
+ "soft_deadline": 1337000039.0
}
},
"name": "save logs.logs.glob.*.log",
@@ -270,7 +195,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000045.0
+ "soft_deadline": 1337000040.5
}
},
"name": "save logs.logs.glob.*.sh",
@@ -295,7 +220,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000046.5
+ "soft_deadline": 1337000042.0
}
},
"name": "save logs.logs.glob.*.stderr",
@@ -320,7 +245,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000048.0
+ "soft_deadline": 1337000043.5
}
},
"name": "save logs.logs.glob.*.stdout",
@@ -345,7 +270,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000049.5
+ "soft_deadline": 1337000045.0
}
},
"name": "save logs.logs.glob.*.txt",
@@ -370,7 +295,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000051.0
+ "soft_deadline": 1337000046.5
}
},
"name": "save logs.logs.glob.*/*.cfg",
@@ -395,7 +320,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000052.5
+ "soft_deadline": 1337000048.0
}
},
"name": "save logs.logs.glob.*/*.ensure",
@@ -413,31 +338,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000054.0
- }
- },
- "name": "save logs.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/checkout",
"*/*.log",
"--hidden"
],
@@ -445,7 +345,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000055.5
+ "soft_deadline": 1337000049.5
}
},
"name": "save logs.logs.glob.*/*.log",
@@ -470,7 +370,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000057.0
+ "soft_deadline": 1337000051.0
}
},
"name": "save logs.logs.glob.*/*.txt",
@@ -488,6 +388,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000052.5
+ }
+ },
+ "name": "save logs.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000054.0
+ }
+ },
+ "name": "save logs.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout",
"*_log",
"--hidden"
],
@@ -495,7 +445,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000058.5
+ "soft_deadline": 1337000055.5
}
},
"name": "save logs.logs.glob.*_log",
@@ -513,6 +463,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000057.0
+ }
+ },
+ "name": "save logs.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000058.5
+ }
+ },
+ "name": "save logs.logs.glob.coverage_reports/*.tar.gz",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/checkout",
"pigweed_environment.gni",
"--hidden"
],
@@ -538,7 +538,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/checkout",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -548,7 +548,7 @@
"soft_deadline": 1337000061.5
}
},
- "name": "save logs.logs.glob.coverage_reports/*.tar.gz",
+ "name": "save logs.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipes/envtest.expected/environment_variables.json b/recipes/envtest.expected/environment_variables.json
index 7c3be30..2bff1a7 100644
--- a/recipes/envtest.expected/environment_variables.json
+++ b/recipes/envtest.expected/environment_variables.json
@@ -1027,81 +1027,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000049.5
- }
- },
- "name": "logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000051.0
- }
- },
- "name": "logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000052.5
- }
- },
- "name": "logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
"*.bat",
"--hidden"
],
@@ -1109,7 +1034,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000054.0
+ "soft_deadline": 1337000049.5
}
},
"name": "logs.glob.*.bat",
@@ -1134,7 +1059,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000055.5
+ "soft_deadline": 1337000051.0
}
},
"name": "logs.glob.*.compdb",
@@ -1159,7 +1084,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000057.0
+ "soft_deadline": 1337000052.5
}
},
"name": "logs.glob.*.gn",
@@ -1184,7 +1109,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000058.5
+ "soft_deadline": 1337000054.0
}
},
"name": "logs.glob.*.graph",
@@ -1209,7 +1134,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000060.0
+ "soft_deadline": 1337000055.5
}
},
"name": "logs.glob.*.json",
@@ -1234,7 +1159,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000061.5
+ "soft_deadline": 1337000057.0
}
},
"name": "logs.glob.*.log",
@@ -1266,7 +1191,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000063.0
+ "soft_deadline": 1337000058.5
}
},
"name": "logs.glob.*.sh",
@@ -1291,7 +1216,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000064.5
+ "soft_deadline": 1337000060.0
}
},
"name": "logs.glob.*.stderr",
@@ -1316,7 +1241,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000066.0
+ "soft_deadline": 1337000061.5
}
},
"name": "logs.glob.*.stdout",
@@ -1341,7 +1266,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000067.5
+ "soft_deadline": 1337000063.0
}
},
"name": "logs.glob.*.txt",
@@ -1366,7 +1291,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000069.0
+ "soft_deadline": 1337000064.5
}
},
"name": "logs.glob.*/*.cfg",
@@ -1391,7 +1316,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000070.5
+ "soft_deadline": 1337000066.0
}
},
"name": "logs.glob.*/*.ensure",
@@ -1409,31 +1334,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000072.0
- }
- },
- "name": "logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
"*/*.log",
"--hidden"
],
@@ -1441,7 +1341,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000073.5
+ "soft_deadline": 1337000067.5
}
},
"name": "logs.glob.*/*.log",
@@ -1466,7 +1366,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000075.0
+ "soft_deadline": 1337000069.0
}
},
"name": "logs.glob.*/*.txt",
@@ -1484,6 +1384,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000070.5
+ }
+ },
+ "name": "logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000072.0
+ }
+ },
+ "name": "logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
"*_log",
"--hidden"
],
@@ -1491,7 +1441,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000076.5
+ "soft_deadline": 1337000073.5
}
},
"name": "logs.glob.*_log",
@@ -1509,6 +1459,56 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000075.0
+ }
+ },
+ "name": "logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000076.5
+ }
+ },
+ "name": "logs.glob.coverage_reports/*.tar.gz",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
"pigweed_environment.gni",
"--hidden"
],
@@ -1534,7 +1534,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -1544,7 +1544,7 @@
"soft_deadline": 1337000079.5
}
},
- "name": "logs.glob.coverage_reports/*.tar.gz",
+ "name": "logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipes/envtest.expected/fail.json b/recipes/envtest.expected/fail.json
index eb6934f..9c1bdae 100644
--- a/recipes/envtest.expected/fail.json
+++ b/recipes/envtest.expected/fail.json
@@ -1597,111 +1597,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000049.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000051.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000052.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
"*.bat",
"--hidden"
],
@@ -1709,7 +1604,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000054.0
+ "soft_deadline": 1337000049.5
},
"realm": {
"name": "project:ci"
@@ -1744,7 +1639,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000055.5
+ "soft_deadline": 1337000051.0
},
"realm": {
"name": "project:ci"
@@ -1779,7 +1674,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000057.0
+ "soft_deadline": 1337000052.5
},
"realm": {
"name": "project:ci"
@@ -1814,7 +1709,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000058.5
+ "soft_deadline": 1337000054.0
},
"realm": {
"name": "project:ci"
@@ -1849,7 +1744,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000060.0
+ "soft_deadline": 1337000055.5
},
"realm": {
"name": "project:ci"
@@ -1884,7 +1779,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000061.5
+ "soft_deadline": 1337000057.0
},
"realm": {
"name": "project:ci"
@@ -1926,7 +1821,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000063.0
+ "soft_deadline": 1337000058.5
},
"realm": {
"name": "project:ci"
@@ -1961,7 +1856,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000064.5
+ "soft_deadline": 1337000060.0
},
"realm": {
"name": "project:ci"
@@ -1996,7 +1891,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000066.0
+ "soft_deadline": 1337000061.5
},
"realm": {
"name": "project:ci"
@@ -2031,7 +1926,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000067.5
+ "soft_deadline": 1337000063.0
},
"realm": {
"name": "project:ci"
@@ -2066,7 +1961,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000069.0
+ "soft_deadline": 1337000064.5
},
"realm": {
"name": "project:ci"
@@ -2101,7 +1996,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000070.5
+ "soft_deadline": 1337000066.0
},
"realm": {
"name": "project:ci"
@@ -2129,41 +2024,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000072.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
"*/*.log",
"--hidden"
],
@@ -2171,7 +2031,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000073.5
+ "soft_deadline": 1337000067.5
},
"realm": {
"name": "project:ci"
@@ -2206,7 +2066,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000075.0
+ "soft_deadline": 1337000069.0
},
"realm": {
"name": "project:ci"
@@ -2234,6 +2094,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000070.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000072.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
"*_log",
"--hidden"
],
@@ -2241,6 +2171,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1337000073.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000075.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1337000076.5
},
"realm": {
@@ -2254,7 +2254,7 @@
"hostname": "rdbhost"
}
},
- "name": "logs.glob.*_log",
+ "name": "logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -2304,7 +2304,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -2324,7 +2324,7 @@
"hostname": "rdbhost"
}
},
- "name": "logs.glob.coverage_reports/*.tar.gz",
+ "name": "logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipes/envtest.expected/pigweed.json b/recipes/envtest.expected/pigweed.json
index 1962374..220cf61 100644
--- a/recipes/envtest.expected/pigweed.json
+++ b/recipes/envtest.expected/pigweed.json
@@ -1591,111 +1591,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000049.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000051.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000052.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
"*.bat",
"--hidden"
],
@@ -1703,7 +1598,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000054.0
+ "soft_deadline": 1337000049.5
},
"realm": {
"name": "project:ci"
@@ -1738,7 +1633,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000055.5
+ "soft_deadline": 1337000051.0
},
"realm": {
"name": "project:ci"
@@ -1773,7 +1668,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000057.0
+ "soft_deadline": 1337000052.5
},
"realm": {
"name": "project:ci"
@@ -1808,7 +1703,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000058.5
+ "soft_deadline": 1337000054.0
},
"realm": {
"name": "project:ci"
@@ -1843,7 +1738,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000060.0
+ "soft_deadline": 1337000055.5
},
"realm": {
"name": "project:ci"
@@ -1878,7 +1773,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000061.5
+ "soft_deadline": 1337000057.0
},
"realm": {
"name": "project:ci"
@@ -1920,7 +1815,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000063.0
+ "soft_deadline": 1337000058.5
},
"realm": {
"name": "project:ci"
@@ -1955,7 +1850,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000064.5
+ "soft_deadline": 1337000060.0
},
"realm": {
"name": "project:ci"
@@ -1990,7 +1885,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000066.0
+ "soft_deadline": 1337000061.5
},
"realm": {
"name": "project:ci"
@@ -2025,7 +1920,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000067.5
+ "soft_deadline": 1337000063.0
},
"realm": {
"name": "project:ci"
@@ -2060,7 +1955,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000069.0
+ "soft_deadline": 1337000064.5
},
"realm": {
"name": "project:ci"
@@ -2095,7 +1990,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000070.5
+ "soft_deadline": 1337000066.0
},
"realm": {
"name": "project:ci"
@@ -2123,41 +2018,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000072.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/environment",
"*/*.log",
"--hidden"
],
@@ -2165,7 +2025,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000073.5
+ "soft_deadline": 1337000067.5
},
"realm": {
"name": "project:ci"
@@ -2200,7 +2060,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000075.0
+ "soft_deadline": 1337000069.0
},
"realm": {
"name": "project:ci"
@@ -2228,6 +2088,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000070.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000072.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
"*_log",
"--hidden"
],
@@ -2235,6 +2165,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1337000073.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000075.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/environment",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1337000076.5
},
"realm": {
@@ -2248,7 +2248,7 @@
"hostname": "rdbhost"
}
},
- "name": "logs.glob.*_log",
+ "name": "logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -2298,7 +2298,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/environment",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -2318,7 +2318,7 @@
"hostname": "rdbhost"
}
},
- "name": "logs.glob.coverage_reports/*.tar.gz",
+ "name": "logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipes/envtest.expected/windows.json b/recipes/envtest.expected/windows.json
index a4c45d7..5798922 100644
--- a/recipes/envtest.expected/windows.json
+++ b/recipes/envtest.expected/windows.json
@@ -1589,111 +1589,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]\\environment",
- "pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000049.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]\\environment",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000051.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]\\environment",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000052.5
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]\\environment",
"*.bat",
"--hidden"
],
@@ -1701,7 +1596,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000054.0
+ "soft_deadline": 1337000049.5
},
"realm": {
"name": "project:ci"
@@ -1736,7 +1631,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000055.5
+ "soft_deadline": 1337000051.0
},
"realm": {
"name": "project:ci"
@@ -1771,7 +1666,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000057.0
+ "soft_deadline": 1337000052.5
},
"realm": {
"name": "project:ci"
@@ -1806,7 +1701,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000058.5
+ "soft_deadline": 1337000054.0
},
"realm": {
"name": "project:ci"
@@ -1841,7 +1736,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000060.0
+ "soft_deadline": 1337000055.5
},
"realm": {
"name": "project:ci"
@@ -1876,7 +1771,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000061.5
+ "soft_deadline": 1337000057.0
},
"realm": {
"name": "project:ci"
@@ -1918,7 +1813,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000063.0
+ "soft_deadline": 1337000058.5
},
"realm": {
"name": "project:ci"
@@ -1953,7 +1848,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000064.5
+ "soft_deadline": 1337000060.0
},
"realm": {
"name": "project:ci"
@@ -1988,7 +1883,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000066.0
+ "soft_deadline": 1337000061.5
},
"realm": {
"name": "project:ci"
@@ -2023,7 +1918,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000067.5
+ "soft_deadline": 1337000063.0
},
"realm": {
"name": "project:ci"
@@ -2058,7 +1953,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000069.0
+ "soft_deadline": 1337000064.5
},
"realm": {
"name": "project:ci"
@@ -2093,7 +1988,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000070.5
+ "soft_deadline": 1337000066.0
},
"realm": {
"name": "project:ci"
@@ -2121,41 +2016,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]\\environment",
- "*/*.json",
- "--hidden"
- ],
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000072.0
- },
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]\\environment",
"*/*.log",
"--hidden"
],
@@ -2163,7 +2023,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000073.5
+ "soft_deadline": 1337000067.5
},
"realm": {
"name": "project:ci"
@@ -2198,7 +2058,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000075.0
+ "soft_deadline": 1337000069.0
},
"realm": {
"name": "project:ci"
@@ -2226,6 +2086,76 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]\\environment",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000070.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]\\environment",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000072.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]\\environment",
"*_log",
"--hidden"
],
@@ -2233,6 +2163,76 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
+ "soft_deadline": 1337000073.5
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "logs.glob.*_log",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]\\environment",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000075.0
+ },
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]\\environment",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
"soft_deadline": 1337000076.5
},
"realm": {
@@ -2246,7 +2246,7 @@
"hostname": "rdbhost"
}
},
- "name": "logs.glob.*_log",
+ "name": "logs.glob.coverage_reports/*.tar.gz",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_END@glob@@@"
@@ -2296,7 +2296,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]\\environment",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"infra_step": true,
@@ -2316,7 +2316,7 @@
"hostname": "rdbhost"
}
},
- "name": "logs.glob.coverage_reports/*.tar.gz",
+ "name": "logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_END@glob@@@"
diff --git a/recipes/target_to_cipd.expected/pw-presubmit.json b/recipes/target_to_cipd.expected/pw-presubmit.json
index 8a874c4..b15a18a 100644
--- a/recipes/target_to_cipd.expected/pw-presubmit.json
+++ b/recipes/target_to_cipd.expected/pw-presubmit.json
@@ -1273,141 +1273,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/co/p/step",
- "pip_install_log.txt",
- "--hidden"
- ],
- "env": {
- "BUILDBUCKET_ID": "0",
- "BUILDBUCKET_NAME": "project:bucket:builder",
- "BUILD_NUMBER": "0",
- "CCACHE_DIR": "[CACHE]/ccache",
- "CLICOLOR": "0",
- "CLICOLOR_FORCE": "0",
- "CTCACHE_DIR": "[CACHE]/clang_tidy",
- "GCC_COLORS": "",
- "GOCACHE": "[CACHE]/go",
- "NO_COLOR": "1",
- "PIP_CACHE_DIR": "[CACHE]/pip",
- "PW_ENVIRONMENT_NO_ERROR_ON_UNRECOGNIZED": "1",
- "PW_ENVSETUP_DISABLE_SPINNER": "1",
- "PW_PRESUBMIT_DISABLE_SUBPROCESS_CAPTURE": "1",
- "PW_TEST_VAR": "test_value",
- "PW_USE_COLOR": "",
- "TEST_TMPDIR": "[CACHE]/bazel",
- "TRIGGERING_CHANGES_JSON": "[CLEANUP]/tmp_tmp_1"
- },
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000057.0
- }
- },
- "name": "step.logs.glob.pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/co/p/step",
- "*/pip_install_log.txt",
- "--hidden"
- ],
- "env": {
- "BUILDBUCKET_ID": "0",
- "BUILDBUCKET_NAME": "project:bucket:builder",
- "BUILD_NUMBER": "0",
- "CCACHE_DIR": "[CACHE]/ccache",
- "CLICOLOR": "0",
- "CLICOLOR_FORCE": "0",
- "CTCACHE_DIR": "[CACHE]/clang_tidy",
- "GCC_COLORS": "",
- "GOCACHE": "[CACHE]/go",
- "NO_COLOR": "1",
- "PIP_CACHE_DIR": "[CACHE]/pip",
- "PW_ENVIRONMENT_NO_ERROR_ON_UNRECOGNIZED": "1",
- "PW_ENVSETUP_DISABLE_SPINNER": "1",
- "PW_PRESUBMIT_DISABLE_SUBPROCESS_CAPTURE": "1",
- "PW_TEST_VAR": "test_value",
- "PW_USE_COLOR": "",
- "TEST_TMPDIR": "[CACHE]/bazel",
- "TRIGGERING_CHANGES_JSON": "[CLEANUP]/tmp_tmp_1"
- },
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000058.5
- }
- },
- "name": "step.logs.glob.*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/co/p/step",
- "*/*/pip_install_log.txt",
- "--hidden"
- ],
- "env": {
- "BUILDBUCKET_ID": "0",
- "BUILDBUCKET_NAME": "project:bucket:builder",
- "BUILD_NUMBER": "0",
- "CCACHE_DIR": "[CACHE]/ccache",
- "CLICOLOR": "0",
- "CLICOLOR_FORCE": "0",
- "CTCACHE_DIR": "[CACHE]/clang_tidy",
- "GCC_COLORS": "",
- "GOCACHE": "[CACHE]/go",
- "NO_COLOR": "1",
- "PIP_CACHE_DIR": "[CACHE]/pip",
- "PW_ENVIRONMENT_NO_ERROR_ON_UNRECOGNIZED": "1",
- "PW_ENVSETUP_DISABLE_SPINNER": "1",
- "PW_PRESUBMIT_DISABLE_SUBPROCESS_CAPTURE": "1",
- "PW_TEST_VAR": "test_value",
- "PW_USE_COLOR": "",
- "TEST_TMPDIR": "[CACHE]/bazel",
- "TRIGGERING_CHANGES_JSON": "[CLEANUP]/tmp_tmp_1"
- },
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000060.0
- }
- },
- "name": "step.logs.glob.*/*/pip_install_log.txt",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/co/p/step",
"*.bat",
"--hidden"
],
@@ -1435,7 +1300,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000061.5
+ "soft_deadline": 1337000057.0
}
},
"name": "step.logs.glob.*.bat",
@@ -1480,7 +1345,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000063.0
+ "soft_deadline": 1337000058.5
}
},
"name": "step.logs.glob.*.compdb",
@@ -1525,7 +1390,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000064.5
+ "soft_deadline": 1337000060.0
}
},
"name": "step.logs.glob.*.gn",
@@ -1570,7 +1435,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000066.0
+ "soft_deadline": 1337000061.5
}
},
"name": "step.logs.glob.*.graph",
@@ -1615,7 +1480,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000067.5
+ "soft_deadline": 1337000063.0
}
},
"name": "step.logs.glob.*.json",
@@ -1660,7 +1525,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000069.0
+ "soft_deadline": 1337000064.5
}
},
"name": "step.logs.glob.*.log",
@@ -1712,7 +1577,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000070.5
+ "soft_deadline": 1337000066.0
}
},
"name": "step.logs.glob.*.sh",
@@ -1757,7 +1622,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000072.0
+ "soft_deadline": 1337000067.5
}
},
"name": "step.logs.glob.*.stderr",
@@ -1802,7 +1667,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000073.5
+ "soft_deadline": 1337000069.0
}
},
"name": "step.logs.glob.*.stdout",
@@ -1847,7 +1712,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000075.0
+ "soft_deadline": 1337000070.5
}
},
"name": "step.logs.glob.*.txt",
@@ -1892,7 +1757,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000076.5
+ "soft_deadline": 1337000072.0
}
},
"name": "step.logs.glob.*/*.cfg",
@@ -1937,7 +1802,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000078.0
+ "soft_deadline": 1337000073.5
}
},
"name": "step.logs.glob.*/*.ensure",
@@ -1955,51 +1820,6 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/co/p/step",
- "*/*.json",
- "--hidden"
- ],
- "env": {
- "BUILDBUCKET_ID": "0",
- "BUILDBUCKET_NAME": "project:bucket:builder",
- "BUILD_NUMBER": "0",
- "CCACHE_DIR": "[CACHE]/ccache",
- "CLICOLOR": "0",
- "CLICOLOR_FORCE": "0",
- "CTCACHE_DIR": "[CACHE]/clang_tidy",
- "GCC_COLORS": "",
- "GOCACHE": "[CACHE]/go",
- "NO_COLOR": "1",
- "PIP_CACHE_DIR": "[CACHE]/pip",
- "PW_ENVIRONMENT_NO_ERROR_ON_UNRECOGNIZED": "1",
- "PW_ENVSETUP_DISABLE_SPINNER": "1",
- "PW_PRESUBMIT_DISABLE_SUBPROCESS_CAPTURE": "1",
- "PW_TEST_VAR": "test_value",
- "PW_USE_COLOR": "",
- "TEST_TMPDIR": "[CACHE]/bazel",
- "TRIGGERING_CHANGES_JSON": "[CLEANUP]/tmp_tmp_1"
- },
- "infra_step": true,
- "luci_context": {
- "deadline": {
- "grace_period": 30.0,
- "soft_deadline": 1337000079.5
- }
- },
- "name": "step.logs.glob.*/*.json",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_END@glob@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "glob",
- "[START_DIR]/co/p/step",
"*/*.log",
"--hidden"
],
@@ -2027,7 +1847,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000081.0
+ "soft_deadline": 1337000075.0
}
},
"name": "step.logs.glob.*/*.log",
@@ -2072,7 +1892,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000082.5
+ "soft_deadline": 1337000076.5
}
},
"name": "step.logs.glob.*/*.txt",
@@ -2090,6 +1910,96 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/co/p/step",
+ "*/*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "env": {
+ "BUILDBUCKET_ID": "0",
+ "BUILDBUCKET_NAME": "project:bucket:builder",
+ "BUILD_NUMBER": "0",
+ "CCACHE_DIR": "[CACHE]/ccache",
+ "CLICOLOR": "0",
+ "CLICOLOR_FORCE": "0",
+ "CTCACHE_DIR": "[CACHE]/clang_tidy",
+ "GCC_COLORS": "",
+ "GOCACHE": "[CACHE]/go",
+ "NO_COLOR": "1",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
+ "PW_ENVIRONMENT_NO_ERROR_ON_UNRECOGNIZED": "1",
+ "PW_ENVSETUP_DISABLE_SPINNER": "1",
+ "PW_PRESUBMIT_DISABLE_SUBPROCESS_CAPTURE": "1",
+ "PW_TEST_VAR": "test_value",
+ "PW_USE_COLOR": "",
+ "TEST_TMPDIR": "[CACHE]/bazel",
+ "TRIGGERING_CHANGES_JSON": "[CLEANUP]/tmp_tmp_1"
+ },
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000078.0
+ }
+ },
+ "name": "step.logs.glob.*/*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/co/p/step",
+ "*/pip_install_log.txt",
+ "--hidden"
+ ],
+ "env": {
+ "BUILDBUCKET_ID": "0",
+ "BUILDBUCKET_NAME": "project:bucket:builder",
+ "BUILD_NUMBER": "0",
+ "CCACHE_DIR": "[CACHE]/ccache",
+ "CLICOLOR": "0",
+ "CLICOLOR_FORCE": "0",
+ "CTCACHE_DIR": "[CACHE]/clang_tidy",
+ "GCC_COLORS": "",
+ "GOCACHE": "[CACHE]/go",
+ "NO_COLOR": "1",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
+ "PW_ENVIRONMENT_NO_ERROR_ON_UNRECOGNIZED": "1",
+ "PW_ENVSETUP_DISABLE_SPINNER": "1",
+ "PW_PRESUBMIT_DISABLE_SUBPROCESS_CAPTURE": "1",
+ "PW_TEST_VAR": "test_value",
+ "PW_USE_COLOR": "",
+ "TEST_TMPDIR": "[CACHE]/bazel",
+ "TRIGGERING_CHANGES_JSON": "[CLEANUP]/tmp_tmp_1"
+ },
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000079.5
+ }
+ },
+ "name": "step.logs.glob.*/pip_install_log.txt",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/co/p/step",
"*_log",
"--hidden"
],
@@ -2117,7 +2027,7 @@
"luci_context": {
"deadline": {
"grace_period": 30.0,
- "soft_deadline": 1337000084.0
+ "soft_deadline": 1337000081.0
}
},
"name": "step.logs.glob.*_log",
@@ -2135,6 +2045,96 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/co/p/step",
+ "cipd/*.json",
+ "--hidden"
+ ],
+ "env": {
+ "BUILDBUCKET_ID": "0",
+ "BUILDBUCKET_NAME": "project:bucket:builder",
+ "BUILD_NUMBER": "0",
+ "CCACHE_DIR": "[CACHE]/ccache",
+ "CLICOLOR": "0",
+ "CLICOLOR_FORCE": "0",
+ "CTCACHE_DIR": "[CACHE]/clang_tidy",
+ "GCC_COLORS": "",
+ "GOCACHE": "[CACHE]/go",
+ "NO_COLOR": "1",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
+ "PW_ENVIRONMENT_NO_ERROR_ON_UNRECOGNIZED": "1",
+ "PW_ENVSETUP_DISABLE_SPINNER": "1",
+ "PW_PRESUBMIT_DISABLE_SUBPROCESS_CAPTURE": "1",
+ "PW_TEST_VAR": "test_value",
+ "PW_USE_COLOR": "",
+ "TEST_TMPDIR": "[CACHE]/bazel",
+ "TRIGGERING_CHANGES_JSON": "[CLEANUP]/tmp_tmp_1"
+ },
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000082.5
+ }
+ },
+ "name": "step.logs.glob.cipd/*.json",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/co/p/step",
+ "coverage_reports/*.tar.gz",
+ "--hidden"
+ ],
+ "env": {
+ "BUILDBUCKET_ID": "0",
+ "BUILDBUCKET_NAME": "project:bucket:builder",
+ "BUILD_NUMBER": "0",
+ "CCACHE_DIR": "[CACHE]/ccache",
+ "CLICOLOR": "0",
+ "CLICOLOR_FORCE": "0",
+ "CTCACHE_DIR": "[CACHE]/clang_tidy",
+ "GCC_COLORS": "",
+ "GOCACHE": "[CACHE]/go",
+ "NO_COLOR": "1",
+ "PIP_CACHE_DIR": "[CACHE]/pip",
+ "PW_ENVIRONMENT_NO_ERROR_ON_UNRECOGNIZED": "1",
+ "PW_ENVSETUP_DISABLE_SPINNER": "1",
+ "PW_PRESUBMIT_DISABLE_SUBPROCESS_CAPTURE": "1",
+ "PW_TEST_VAR": "test_value",
+ "PW_USE_COLOR": "",
+ "TEST_TMPDIR": "[CACHE]/bazel",
+ "TRIGGERING_CHANGES_JSON": "[CLEANUP]/tmp_tmp_1"
+ },
+ "infra_step": true,
+ "luci_context": {
+ "deadline": {
+ "grace_period": 30.0,
+ "soft_deadline": 1337000084.0
+ }
+ },
+ "name": "step.logs.glob.coverage_reports/*.tar.gz",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@3@@@",
+ "@@@STEP_LOG_END@glob@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "glob",
+ "[START_DIR]/co/p/step",
"pigweed_environment.gni",
"--hidden"
],
@@ -2180,7 +2180,7 @@
"/path/to/tmp/json",
"glob",
"[START_DIR]/co/p/step",
- "coverage_reports/*.tar.gz",
+ "pip_install_log.txt",
"--hidden"
],
"env": {
@@ -2210,7 +2210,7 @@
"soft_deadline": 1337000087.0
}
},
- "name": "step.logs.glob.coverage_reports/*.tar.gz",
+ "name": "step.logs.glob.pip_install_log.txt",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_END@glob@@@"
