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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/infra/recipe_roll_tryjob.expected/three_patches.json

Issue 1971983002: recipe_tryjob: Allow test bypass. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« scripts/slave/recipe_modules/recipe_tryjob/api.py ('K') | « scripts/slave/recipes/infra/recipe_roll_tryjob.expected/one_patch.json ('k') | scripts/slave/recipes/infra/recipe_roll_tryjob.expected/three_patches_fail_not_ok.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/infra/recipe_roll_tryjob.expected/three_patches.json
diff --git a/scripts/slave/recipes/infra/recipe_roll_tryjob.expected/tryjob.json b/scripts/slave/recipes/infra/recipe_roll_tryjob.expected/three_patches.json
similarity index 67%
copy from scripts/slave/recipes/infra/recipe_roll_tryjob.expected/tryjob.json
copy to scripts/slave/recipes/infra/recipe_roll_tryjob.expected/three_patches.json
index 933f25e040d3a6626c30a93fa3898068f3d3ff9b..bb89c352e1d52da262a4905a63dd31ef7c4643c1 100644
--- a/scripts/slave/recipes/infra/recipe_roll_tryjob.expected/tryjob.json
+++ b/scripts/slave/recipes/infra/recipe_roll_tryjob.expected/three_patches.json
@@ -120,6 +120,19 @@
"python",
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/tools/pycurl.py",
+ "https://luci-config.appspot.com//_ah/api/config/v1/config_sets/projects%2Fdepot_tools%2Frefs%2Fheads%2Fmaster/config/recipes.cfg",
+ "--outfile",
+ "/path/to/tmp/",
+ "--headers-json",
+ "{\"Authorization\": \"Bearer ya29.foobar\"}"
+ ],
+ "name": "Get project 'depot_tools' config 'recipes.cfg'"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/pycurl.py",
"https://luci-config.appspot.com//_ah/api/config/v1/config_sets/projects%2Frecipe_engine%2Frefs%2Fheads%2Fmaster/config/recipes.cfg",
"--outfile",
"/path/to/tmp/",
@@ -143,13 +156,65 @@
},
{
"cmd": [
+ "RECIPE_PACKAGE_REPO[depot_tools]/git_cl.py",
+ "description",
+ "-d",
+ "--rietveld",
+ "https://fake.code.review/123456"
+ ],
+ "name": "git_cl description (depot_tools)",
+ "stdout": "/path/to/tmp/"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[depot_tools]/git_footers.py",
+ "--json",
+ "/path/to/tmp/json"
+ ],
+ "name": "parse description",
+ "stdin": "",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "RECIPE_PACKAGE_REPO[depot_tools]/git_cl.py",
+ "description",
+ "-d",
+ "--rietveld",
+ "https://fake.code.review/789999"
+ ],
+ "name": "git_cl description (build)",
+ "stdout": "/path/to/tmp/"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[depot_tools]/git_footers.py",
+ "--json",
+ "/path/to/tmp/json"
+ ],
+ "name": "parse description (2)",
+ "stdin": "",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
"python",
"-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
- "[SLAVE_BUILD]/build/build",
+ "[SLAVE_BUILD]/depot_tools/depot_tools",
"511"
],
- "name": "makedirs build directory",
+ "name": "makedirs depot_tools directory",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
@@ -169,15 +234,15 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec",
- "cache_dir = '[SLAVE_BUILD]/__cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://repo.repo/build'}]",
+ "cache_dir = '[SLAVE_BUILD]/__cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'depot_tools', 'url': 'https://repo.repo/depot_tools'}]",
"--root",
- "build",
+ "depot_tools",
"--revision_mapping_file",
"{}",
"--git-cache-dir",
"[SLAVE_BUILD]/__cache_dir",
"--issue",
- "12345678",
+ "123456",
"--patchset",
"1",
"--rietveld_server",
@@ -185,27 +250,27 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "build@HEAD",
+ "depot_tools@HEAD",
"--force",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]/build",
+ "cwd": "[SLAVE_BUILD]/depot_tools",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
- "name": "bot_update - build",
+ "name": "bot_update - depot_tools",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"build\": \"HEAD\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"depot_tools\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {}, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"build\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"depot_tools\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {}, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"build\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \"depot_tools\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
@@ -246,8 +311,6 @@
"{}",
"--git-cache-dir",
"[SLAVE_BUILD]/__cache_dir",
- "--rietveld_server",
- "https://fake.code.review",
"--output_json",
"/path/to/tmp/json",
"--revision",
@@ -279,6 +342,89 @@
},
{
"cmd": [
+ "python",
+ "-u",
+ "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
+ "[SLAVE_BUILD]/build/build",
+ "511"
+ ],
+ "name": "makedirs build directory",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
+ "--spec",
+ "cache_dir = '[SLAVE_BUILD]/__cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://repo.repo/build'}]",
+ "--root",
+ "build",
+ "--revision_mapping_file",
+ "{}",
+ "--git-cache-dir",
+ "[SLAVE_BUILD]/__cache_dir",
+ "--issue",
+ "789999",
+ "--patchset",
+ "2",
+ "--rietveld_server",
+ "https://fake.code.review",
+ "--output_json",
+ "/path/to/tmp/json",
+ "--revision",
+ "build@HEAD",
+ "--force",
+ "--output_manifest"
+ ],
+ "cwd": "[SLAVE_BUILD]/build",
+ "env": {
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ },
+ "name": "bot_update - build",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@Some step text@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"build\": \"HEAD\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"manifest\": {}, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"build\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"properties\": {}, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \"build\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[SLAVE_BUILD]/infra/ENV/bin/python",
+ "-u",
+ "[SLAVE_BUILD]/depot_tools/depot_tools/recipes.py",
+ "-O",
+ "recipe_engine=[SLAVE_BUILD]/recipe_engine/recipe_engine",
+ "--package",
+ "[SLAVE_BUILD]/depot_tools/depot_tools/infra/config/recipes.cfg",
+ "simulation_test"
+ ],
+ "name": "depot_tools tests"
+ },
+ {
+ "cmd": [
"[SLAVE_BUILD]/infra/ENV/bin/python",
"-u",
"[SLAVE_BUILD]/recipe_engine/recipe_engine/recipes.py",
@@ -294,6 +440,8 @@
"-u",
"[SLAVE_BUILD]/build/build/recipes.py",
"-O",
+ "depot_tools=[SLAVE_BUILD]/depot_tools/depot_tools",
+ "-O",
"recipe_engine=[SLAVE_BUILD]/recipe_engine/recipe_engine",
"--package",
"[SLAVE_BUILD]/build/build/infra/config/recipes.cfg",
« scripts/slave/recipe_modules/recipe_tryjob/api.py ('K') | « scripts/slave/recipes/infra/recipe_roll_tryjob.expected/one_patch.json ('k') | scripts/slave/recipes/infra/recipe_roll_tryjob.expected/three_patches_fail_not_ok.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698