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

Unified Diff: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-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-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release-Swarming.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release-Swarming.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release-Swarming.json
index bd82382eba574f20f202613cd0a3aa7bf0d7b9b5..5ee41777eadc22f207179a8d7da566208fbc4b32 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release-Swarming.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-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]"
},
@@ -142,7 +140,6 @@
"--url",
"https://chromium.googlesource.com/external/swarming.client.git"
],
- "cwd": "[SLAVE_BUILD]",
"name": "git setup (swarming_client)"
},
{
@@ -217,7 +214,6 @@
"[SLAVE_BUILD]/swarming.client/swarming.py",
"--version"
],
- "cwd": "[SLAVE_BUILD]",
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -235,7 +231,6 @@
"-d",
"[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
],
- "cwd": "[SLAVE_BUILD]",
"name": "download luci-go linux"
},
{
@@ -249,7 +244,6 @@
"-d",
"[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
],
- "cwd": "[SLAVE_BUILD]",
"name": "download luci-go mac"
},
{
@@ -263,7 +257,6 @@
"-d",
"[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
],
- "cwd": "[SLAVE_BUILD]",
"name": "download luci-go win"
},
{
@@ -273,7 +266,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@@@@",
@@ -295,7 +287,6 @@
"[SLAVE_BUILD]/luci-go",
"0"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Copy Go binary"
},
{
@@ -306,7 +297,6 @@
"[BUILD]/third_party/infra",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs third_party_infra",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -329,7 +319,6 @@
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs swarming tmp dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -352,7 +341,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"
},
{
@@ -369,7 +357,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@{@@@",
@@ -430,7 +417,6 @@
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs swarming tmp dir (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -453,7 +439,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 \"Ubuntu\", \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"
},
{
@@ -470,7 +455,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@{@@@",
@@ -488,7 +472,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@@@@",
@@ -513,7 +496,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/"
},
@@ -580,7 +562,6 @@
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=164710"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] compile_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -613,7 +594,6 @@
"--task-summary-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "compile_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
@@ -666,7 +646,6 @@
"[SLAVE_BUILD]/tmp",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs tmp_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -689,7 +668,6 @@
"[SLAVE_BUILD]/tmp/SKP_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded SKP_VERSION"
},
{
@@ -700,7 +678,6 @@
"[SLAVE_BUILD]/skia/SKP_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get expected SKP_VERSION"
},
{
@@ -711,7 +688,6 @@
"[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded SK_IMAGE_VERSION"
},
{
@@ -722,7 +698,6 @@
"[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get expected SK_IMAGE_VERSION"
},
{
@@ -733,7 +708,6 @@
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs swarming tmp dir (3)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -756,7 +730,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 \"Android\", \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"
},
{
@@ -773,7 +746,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@{@@@",
@@ -792,7 +764,6 @@
"[dummy hash for isolate_recipes]",
"abc123"
],
- "cwd": "[SLAVE_BUILD]",
"name": "add_isolated_input (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -817,7 +788,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/"
},
@@ -883,7 +853,6 @@
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=164710"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] test_skia on Android",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -907,7 +876,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@@@@",
@@ -938,7 +906,6 @@
"--task-output-dir",
"[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia"
],
- "cwd": "[SLAVE_BUILD]",
"name": "test_skia on Android",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
@@ -990,7 +957,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@@@@",
@@ -1012,7 +978,6 @@
"[SLAVE_BUILD]/dm",
"0"
],
- "cwd": "[SLAVE_BUILD]",
"name": "dm_dir"
},
{

Powered by Google App Engine
This is Rietveld 408576698