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

Unified Diff: scripts/slave/recipes/skia/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming.json

Issue 1930433002: Roll recipe dependencies (nontrivial). (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build@master
Patch Set: Rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/skia/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming.json
index 8dff1caf1af5d6f2d68acda0b6a807560ef0e5cd..d25ca06cd21a7cb9604a3a5a34a28e1b0eef1603 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming.json
@@ -47,7 +47,6 @@
"--spec",
"cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -68,7 +67,6 @@
"--output-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -143,7 +141,6 @@
"--url",
"https://chromium.googlesource.com/external/swarming.client.git"
],
- "cwd": "[SLAVE_BUILD]",
"name": "git setup (swarming_client)"
},
{
@@ -218,7 +215,6 @@
"[SLAVE_BUILD]/swarming.client/swarming.py",
"--version"
],
- "cwd": "[SLAVE_BUILD]",
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -236,7 +232,6 @@
"-d",
"[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
],
- "cwd": "[SLAVE_BUILD]",
"name": "download luci-go linux"
},
{
@@ -250,7 +245,6 @@
"-d",
"[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
],
- "cwd": "[SLAVE_BUILD]",
"name": "download luci-go mac"
},
{
@@ -264,7 +258,6 @@
"-d",
"[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
],
- "cwd": "[SLAVE_BUILD]",
"name": "download luci-go win"
},
{
@@ -274,7 +267,6 @@
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
"[SLAVE_BUILD]/luci-go"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree Go binary dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -296,7 +288,6 @@
"[SLAVE_BUILD]/luci-go",
"0"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Copy Go binary"
},
{
@@ -307,7 +298,6 @@
"[BUILD]/third_party/infra",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs third_party_infra",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -330,7 +320,6 @@
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs swarming tmp dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -353,7 +342,6 @@
"{\n \"args\": [\n \"--isolate\", \n \"[BUILD]/scripts/slave/recipes/skia/swarm_recipe.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-isolate_recipes.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\"\n ], \n \"dir\": \"[BUILD]/scripts/slave/recipes/skia\", \n \"version\": 1\n}",
"[SLAVE_BUILD]/swarming_temp_dir/isolate_recipes.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Write isolate_recipes.isolated.gen.json"
},
{
@@ -370,7 +358,6 @@
"--verbose",
"[SLAVE_BUILD]/swarming_temp_dir/isolate_recipes.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -432,7 +419,6 @@
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs swarming tmp dir (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -455,7 +441,6 @@
"{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Mac\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\", \n \"--extra-variable\", \n \"BUILD\", \n \"[BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
"[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Write compile_skia.isolated.gen.json"
},
{
@@ -472,7 +457,6 @@
"--verbose",
"[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "isolate tests (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -490,7 +474,6 @@
"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated",
"[dummy hash for isolate_recipes]"
],
- "cwd": "[SLAVE_BUILD]",
"name": "add_isolated_input",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -515,7 +498,6 @@
"https://isolateserver.appspot.com",
"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated"
],
- "cwd": "[SLAVE_BUILD]",
"name": "upload new .isolated file for compile_skia",
"stdout": "/path/to/tmp/"
},
@@ -582,7 +564,6 @@
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=164710"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] compile_skia on Mac",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -615,7 +596,6 @@
"--task-summary-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "compile_skia on Mac",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
@@ -668,7 +648,6 @@
"[SLAVE_BUILD]/tmp",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs tmp_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -691,7 +670,6 @@
"[SLAVE_BUILD]/tmp/SKP_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded SKP_VERSION"
},
{
@@ -702,7 +680,6 @@
"[SLAVE_BUILD]/skia/SKP_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get expected SKP_VERSION"
},
{
@@ -713,7 +690,6 @@
"[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded SK_IMAGE_VERSION"
},
{
@@ -724,7 +700,6 @@
"[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get expected SK_IMAGE_VERSION"
},
{
@@ -735,7 +710,6 @@
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs swarming tmp dir (3)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -758,7 +732,6 @@
"{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"iOS-9.2\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\", \n \"--extra-variable\", \n \"BUILD\", \n \"[BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
"[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Write test_skia.isolated.gen.json"
},
{
@@ -775,7 +748,6 @@
"--verbose",
"[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "isolate tests (3)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -794,7 +766,6 @@
"[dummy hash for isolate_recipes]",
"abc123"
],
- "cwd": "[SLAVE_BUILD]",
"name": "add_isolated_input (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -819,7 +790,6 @@
"https://isolateserver.appspot.com",
"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated"
],
- "cwd": "[SLAVE_BUILD]",
"name": "upload new .isolated file for test_skia",
"stdout": "/path/to/tmp/"
},
@@ -885,7 +855,6 @@
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=164710"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] test_skia on iOS-9.2",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -909,7 +878,6 @@
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
"[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree results_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -940,7 +908,6 @@
"--task-output-dir",
"[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia"
],
- "cwd": "[SLAVE_BUILD]",
"name": "test_skia on iOS-9.2",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
@@ -992,7 +959,6 @@
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
"[SLAVE_BUILD]/dm"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree dm_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -1014,7 +980,6 @@
"[SLAVE_BUILD]/dm",
"0"
],
- "cwd": "[SLAVE_BUILD]",
"name": "dm_dir"
},
{

Powered by Google App Engine
This is Rietveld 408576698