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

Unified Diff: scripts/slave/recipes/skia/swarm_trigger.expected/No_downloaded_SKP_VERSION.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/No_downloaded_SKP_VERSION.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/No_downloaded_SKP_VERSION.json b/scripts/slave/recipes/skia/swarm_trigger.expected/No_downloaded_SKP_VERSION.json
index 144f2136307a2c53ad7e5e3f7ecdbb1514977b12..4518e17c6d24022c2f769da0d1bee48ae4922486 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/No_downloaded_SKP_VERSION.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/No_downloaded_SKP_VERSION.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]"
},
@@ -141,7 +139,6 @@
"--url",
"https://chromium.googlesource.com/external/swarming.client.git"
],
- "cwd": "[SLAVE_BUILD]",
"name": "git setup (swarming_client)"
},
{
@@ -216,7 +213,6 @@
"[SLAVE_BUILD]/swarming.client/swarming.py",
"--version"
],
- "cwd": "[SLAVE_BUILD]",
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -234,7 +230,6 @@
"-d",
"[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
],
- "cwd": "[SLAVE_BUILD]",
"name": "download luci-go linux"
},
{
@@ -248,7 +243,6 @@
"-d",
"[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
],
- "cwd": "[SLAVE_BUILD]",
"name": "download luci-go mac"
},
{
@@ -262,7 +256,6 @@
"-d",
"[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
],
- "cwd": "[SLAVE_BUILD]",
"name": "download luci-go win"
},
{
@@ -272,7 +265,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@@@@",
@@ -294,7 +286,6 @@
"[SLAVE_BUILD]/luci-go",
"0"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Copy Go binary"
},
{
@@ -305,7 +296,6 @@
"[BUILD]/third_party/infra",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs third_party_infra",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -328,7 +318,6 @@
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs swarming tmp dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -351,7 +340,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"
},
{
@@ -368,7 +356,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@{@@@",
@@ -428,7 +415,6 @@
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs swarming tmp dir (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -451,7 +437,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"
},
{
@@ -468,7 +453,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@{@@@",
@@ -486,7 +470,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@@@@",
@@ -511,7 +494,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/"
},
@@ -578,7 +560,6 @@
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=164710"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] compile_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -611,7 +592,6 @@
"--task-summary-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "compile_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
@@ -664,7 +644,6 @@
"[SLAVE_BUILD]/tmp",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs tmp_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -687,7 +666,6 @@
"[SLAVE_BUILD]/tmp/SKP_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded SKP_VERSION",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -702,7 +680,6 @@
"[SLAVE_BUILD]/skia/SKP_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get expected SKP_VERSION"
},
{
@@ -712,7 +689,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]/skps"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree skps",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -733,7 +709,6 @@
"[SLAVE_BUILD]/skps",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs skps",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -761,7 +736,6 @@
"gs://chromium-skia-gm/playback_42/skps/*",
"[SLAVE_BUILD]/skps"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
"BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"
@@ -776,7 +750,6 @@
"42",
"[SLAVE_BUILD]/tmp/SKP_VERSION"
],
- "cwd": "[SLAVE_BUILD]",
"name": "write SKP_VERSION"
},
{
@@ -787,7 +760,6 @@
"[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded SK_IMAGE_VERSION"
},
{
@@ -798,7 +770,6 @@
"[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Get expected SK_IMAGE_VERSION"
},
{
@@ -809,7 +780,6 @@
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs swarming tmp dir (3)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -832,7 +802,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 \"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/test_skia.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Write test_skia.isolated.gen.json"
},
{
@@ -849,7 +818,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@{@@@",
@@ -868,7 +836,6 @@
"[dummy hash for isolate_recipes]",
"abc123"
],
- "cwd": "[SLAVE_BUILD]",
"name": "add_isolated_input (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -893,7 +860,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/"
},
@@ -959,7 +925,6 @@
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=164710"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] test_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -984,7 +949,6 @@
"[SLAVE_BUILD]/swarming_temp_dir",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs swarming tmp dir (4)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -1007,7 +971,6 @@
"{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/perf_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_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/perf_skia.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Write perf_skia.isolated.gen.json"
},
{
@@ -1024,7 +987,6 @@
"--verbose",
"[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "isolate tests (4)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1043,7 +1005,6 @@
"[dummy hash for isolate_recipes]",
"abc123"
],
- "cwd": "[SLAVE_BUILD]",
"name": "add_isolated_input (3)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -1068,7 +1029,6 @@
"https://isolateserver.appspot.com",
"[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated"
],
- "cwd": "[SLAVE_BUILD]",
"name": "upload new .isolated file for perf_skia",
"stdout": "/path/to/tmp/"
},
@@ -1134,7 +1094,6 @@
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=164710"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] perf_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1158,7 +1117,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@@@@",
@@ -1189,7 +1147,6 @@
"--task-output-dir",
"[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia"
],
- "cwd": "[SLAVE_BUILD]",
"name": "test_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
@@ -1241,7 +1198,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@@@@",
@@ -1263,7 +1219,6 @@
"[SLAVE_BUILD]/dm",
"0"
],
- "cwd": "[SLAVE_BUILD]",
"name": "dm_dir"
},
{
@@ -1292,7 +1247,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/perf_skia"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree results_dir (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -1323,7 +1277,6 @@
"--task-output-dir",
"[SLAVE_BUILD]/swarming_temp_dir/outputs/perf_skia"
],
- "cwd": "[SLAVE_BUILD]",
"name": "perf_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",

Powered by Google App Engine
This is Rietveld 408576698