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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json

Issue 2190933002: Fixes for SwarmBucket bot (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix print_properties Created 4 years, 5 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
« no previous file with comments | « infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json ('k') | infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
index 68f8b65a823584624609d095f6639c9aab2619f9..3a19e4bf16c98266ceb5ec4952891273a78060c1 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
@@ -1,11 +1,31 @@
[
{
"cmd": [
+ "python",
+ "-u",
+ "\nimport json\nimport sys\n\nwith open(sys.argv[1]) as f:\n content = json.load(f)\n\nprint json.dumps(content, indent=2)\n",
+ "{\"buildername\": \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
+ ],
+ "name": "print properties",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import json@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1]) as f:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ content = json.load(f)@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@print json.dumps(content, indent=2)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
"git",
"rev-parse",
"HEAD"
],
- "cwd": "[ROOT]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "git rev-parse",
"stdout": "/path/to/tmp/"
},
@@ -24,9 +44,19 @@
"cmd": [
"python",
"-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "",
+ "[SLAVE_BUILD]/.gclient"
+ ],
+ "name": "write .gclient"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"import os\nfor r, _, files in os.walk(os.getcwd()):\n for fname in files:\n f = os.path.join(r, fname)\n if os.path.isfile(f):\n if os.access(f, os.X_OK):\n os.chmod(f, 0755)\n else:\n os.chmod(f, 0644)\n"
],
- "cwd": "[ROOT]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "fix filemodes",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import os@@@",
@@ -140,7 +170,7 @@
"--bucket",
"chromium-luci",
"-d",
- "[ROOT]/skia/infra/bots/tools/luci-go/linux64"
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
],
"name": "download luci-go linux"
},
@@ -153,7 +183,7 @@
"--bucket",
"chromium-luci",
"-d",
- "[ROOT]/skia/infra/bots/tools/luci-go/mac64"
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
],
"name": "download luci-go mac"
},
@@ -166,7 +196,7 @@
"--bucket",
"chromium-luci",
"-d",
- "[ROOT]/skia/infra/bots/tools/luci-go/win64"
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
],
"name": "download luci-go win"
},
@@ -178,7 +208,7 @@
"[SLAVE_BUILD]/luci-go"
],
"env": {
- "PYTHONPATH": "[ROOT]/skia/infra/bots/.recipe_deps/build/scripts"
+ "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"
},
"name": "rmtree luci-go",
"~followup_annotations": [
@@ -197,7 +227,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n",
- "[ROOT]/skia/infra/bots/tools/luci-go",
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go",
"[SLAVE_BUILD]/luci-go",
"0"
],
@@ -219,11 +249,11 @@
"cmd": [
"python",
"-u",
- "[ROOT]/skia/tools/buildbot_spec.py",
+ "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
"/path/to/tmp/json",
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
],
- "cwd": "[ROOT]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "exec buildbot_spec.py",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -328,7 +358,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "{\n \"args\": [\n \"--isolate\", \n \"[ROOT]/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 \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
+ "{\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 \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
"[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
],
"name": "Write compile_skia.isolated.gen.json"
@@ -505,7 +535,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[ROOT]/skia/infra/bots/assets/skp/VERSION",
+ "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION",
"/path/to/tmp/"
],
"name": "read skp VERSION"
@@ -515,7 +545,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[ROOT]/skia/infra/bots/assets/skimage/VERSION",
+ "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION",
"/path/to/tmp/"
],
"name": "read skimage VERSION"
@@ -547,7 +577,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "{\n \"args\": [\n \"--isolate\", \n \"[ROOT]/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 \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
+ "{\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 \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
"[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json"
],
"name": "Write test_skia.isolated.gen.json"
@@ -729,7 +759,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "{\n \"args\": [\n \"--isolate\", \n \"[ROOT]/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 \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
+ "{\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 \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
"[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json"
],
"name": "Write perf_skia.isolated.gen.json"
@@ -892,7 +922,7 @@
"[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia"
],
"env": {
- "PYTHONPATH": "[ROOT]/skia/infra/bots/.recipe_deps/build/scripts"
+ "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"
},
"name": "rmtree test_skia",
"~followup_annotations": [
@@ -976,7 +1006,7 @@
"[SLAVE_BUILD]/dm"
],
"env": {
- "PYTHONPATH": "[ROOT]/skia/infra/bots/.recipe_deps/build/scripts"
+ "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"
},
"name": "rmtree dm",
"~followup_annotations": [
@@ -1013,7 +1043,7 @@
"",
"[SLAVE_BUILD]/skia/common/py/utils"
],
- "cwd": "[ROOT]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"env": {
"AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
"BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"
@@ -1028,7 +1058,7 @@
"[SLAVE_BUILD]/swarming_temp_dir/outputs/perf_skia"
],
"env": {
- "PYTHONPATH": "[ROOT]/skia/infra/bots/.recipe_deps/build/scripts"
+ "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"
},
"name": "rmtree perf_skia",
"~followup_annotations": [
« no previous file with comments | « infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json ('k') | infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698