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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json

Issue 1862713002: Convert Coverage flavor and bot to Swarming (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build@master
Patch Set: Rename 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
« no previous file with comments | « scripts/slave/recipes/skia/swarm_test.py ('k') | scripts/slave/recipes/skia/swarm_trigger.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
diff --git a/scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
similarity index 50%
rename from scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
rename to scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
index 3cde017e5efd7a0afa35078f4f25004197836af0..50f76e7b41e7392f2aaa262d1ae63ba98a8ce74b 100644
--- a/scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
+++ b/scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
@@ -1,124 +1,6 @@
[
{
"cmd": [
- "git",
- "remote",
- "set-url",
- "origin",
- "https://skia.googlesource.com/skia.git"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "git remote set-url"
- },
- {
- "cmd": [
- "git",
- "fetch"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "git fetch"
- },
- {
- "cmd": [
- "git",
- "reset",
- "--hard",
- "abc123"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "git reset"
- },
- {
- "cmd": [
- "git",
- "clean",
- "-d",
- "-f"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "git clean"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
- "config",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\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]"
- },
- "name": "gclient setup"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILD]/scripts/slave/gclient_safe_revert.py",
- ".",
- "[DEPOT_TOOLS]/gclient"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "gclient revert"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
- "sync",
- "--nohooks",
- "--force",
- "--verbose",
- "--delete_unversioned_trees",
- "--revision",
- "skia@abc123",
- "--output-json",
- "/path/to/tmp/json"
- ],
- "cwd": "[SLAVE_BUILD]",
- "env": {
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient sync",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 164710@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@164710@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "[DEPOT_TOOLS]/apply_issue.py",
- "-r",
- "[SLAVE_BUILD]/skia",
- "-i",
- "500",
- "-p",
- "1",
- "-s",
- "https://codereview.chromium.org",
- "--no-auth"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "apply_issue",
- "~followup_annotations": [
- "@@@STEP_LINK@Applied issue 500@https://codereview.chromium.org/500@@@"
- ]
- },
- {
- "cmd": [
"python",
"-u",
"[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
@@ -147,6 +29,7 @@
"@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@",
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"do_compile_steps\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"env\": {@@@",
@@ -165,44 +48,6 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/skia/tools/llvm_coverage_build",
- "dm"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "env": {
- "BUILDTYPE": "Coverage",
- "CC": "/usr/bin/clang-3.6",
- "CXX": "/usr/bin/clang++-3.6",
- "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0",
- "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot"
- },
- "name": "build dm"
- },
- {
- "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]/tmp",
- "511"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "makedirs tmp_dir",
- "~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",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
@@ -217,17 +62,6 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/skia/SKP_VERSION",
- "/path/to/tmp/"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "Get expected SKP_VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
"/path/to/tmp/"
],
@@ -236,23 +70,32 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
- "/path/to/tmp/"
+ "[SLAVE_BUILD]/skia/tools/llvm_coverage_build",
+ "dm"
],
- "cwd": "[SLAVE_BUILD]",
- "name": "Get expected SK_IMAGE_VERSION"
+ "cwd": "[SLAVE_BUILD]/skia",
+ "env": {
+ "BUILDTYPE": "Coverage",
+ "CC": "/usr/bin/clang-3.6",
+ "CHROME_HEADLESS": "1",
+ "CXX": "/usr/bin/clang++-3.6",
+ "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0",
+ "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
+ "SKIA_OUT": "[SLAVE_BUILD]/out"
+ },
+ "name": "build dm"
},
{
"cmd": [
"python",
"-u",
"\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]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/coverage_results"
+ "[SLAVE_BUILD]/out/coverage_results"
],
"cwd": "[SLAVE_BUILD]",
+ "env": {
+ "PYTHONPATH": "build/scripts"
+ },
"name": "rmtree coverage_results",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -270,7 +113,7 @@
"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]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/coverage_results",
+ "[SLAVE_BUILD]/out/coverage_results",
"511"
],
"cwd": "[SLAVE_BUILD]",
@@ -297,13 +140,13 @@
"--resourcePath",
"[SLAVE_BUILD]/skia/resources",
"--skps",
- "[SLAVE_BUILD]/playback/skps",
+ "[SLAVE_BUILD]/skps",
"--images",
"[SLAVE_BUILD]/images/dm",
"--nameByHash",
"--properties",
"gitHash",
- "164710",
+ "abc123",
"master",
"client.skia",
"builder",
@@ -332,40 +175,30 @@
"--nogpu",
"--dummy-flags",
"--outResultsFile",
- "[SLAVE_BUILD]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/coverage_results/164710.cov"
+ "[SLAVE_BUILD]/out/coverage_results/abc123.cov"
],
"cwd": "[SLAVE_BUILD]/skia",
"env": {
"BUILDTYPE": "Coverage",
"CC": "/usr/bin/clang-3.6",
+ "CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++-3.6",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0",
- "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot"
+ "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
+ "SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "dm"
},
{
"cmd": [
- "git",
- "show",
- "HEAD",
- "--format=%at",
- "-s"
- ],
- "cwd": "[SLAVE_BUILD]/skia",
- "name": "git show",
- "stdout": "/path/to/tmp/"
- },
- {
- "cmd": [
"python",
"[SLAVE_BUILD]/skia/tools/parse_llvm_coverage.py",
"--report",
- "[SLAVE_BUILD]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/coverage_results/164710.cov",
+ "[SLAVE_BUILD]/out/coverage_results/abc123.cov",
"--nanobench",
- "[SLAVE_BUILD]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/coverage_results/nanobench_164710_1408633190.json",
+ "[SLAVE_BUILD]/out/coverage_results/nanobench_abc123.json",
"--linebyline",
- "[SLAVE_BUILD]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/coverage_results/coverage_by_line_164710_1408633190.json",
+ "[SLAVE_BUILD]/out/coverage_results/coverage_by_line_abc123.json",
"--key",
"arch",
"x86_64",
@@ -383,7 +216,7 @@
"Ubuntu",
"--properties",
"gitHash",
- "164710",
+ "abc123",
"master",
"client.skia",
"builder",
@@ -399,9 +232,11 @@
"env": {
"BUILDTYPE": "Coverage",
"CC": "/usr/bin/clang-3.6",
+ "CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++-3.6",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0",
- "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot"
+ "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
+ "SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "Generate Coverage Data"
},
@@ -409,79 +244,47 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
- "--",
- "[DEPOT_TOOLS]/gsutil.py",
- "----",
- "cp",
- "-R",
- "[SLAVE_BUILD]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/coverage_results/164710.cov",
- "gs://skia-infra/coverage-raw-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/164710.cov"
+ "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n",
+ "[SLAVE_BUILD]/out/coverage_results",
+ "/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
- "env": {
- "AWS_CREDENTIAL_FILE": null,
- "BOTO_CONFIG": null,
- "BUILDTYPE": "Coverage",
- "CC": "/usr/bin/clang-3.6",
- "CXX": "/usr/bin/clang++-3.6",
- "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0",
- "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot"
- },
- "name": "gsutil upload raw coverage data",
+ "name": "listdir results_dir",
"~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-infra/coverage-raw-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/164710.cov@@@"
+ "@@@STEP_LOG_LINE@json.output@[@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@",
+ "@@@STEP_LOG_LINE@json.output@]@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[build::skia]/resources/upload_bench_results.py",
- "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot",
- "5",
- "[SLAVE_BUILD]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/coverage_results",
- "164710",
- "[DEPOT_TOOLS]/third_party/gsutil/gsutil",
- "500"
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/out/coverage_results/file 1",
+ "[SWARM_OUT_DIR]"
],
- "cwd": "[SLAVE_BUILD]/skia",
- "env": {
- "BUILDTYPE": "Coverage",
- "CC": "/usr/bin/clang-3.6",
- "CXX": "/usr/bin/clang++-3.6",
- "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0",
- "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot"
- },
- "name": "upload nanobench coverage results"
+ "cwd": "[SLAVE_BUILD]",
+ "name": "Copy to swarming out"
},
{
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
- "--",
- "[DEPOT_TOOLS]/gsutil.py",
- "----",
- "cp",
- "-R",
- "[SLAVE_BUILD]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/coverage_results/coverage_by_line_164710_1408633190.json",
- "gs://skia-infra/coverage-json-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/coverage_by_line_164710_1408633190.json"
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/out/coverage_results/file 2",
+ "[SWARM_OUT_DIR]"
],
"cwd": "[SLAVE_BUILD]",
- "env": {
- "AWS_CREDENTIAL_FILE": null,
- "BOTO_CONFIG": null,
- "BUILDTYPE": "Coverage",
- "CC": "/usr/bin/clang-3.6",
- "CXX": "/usr/bin/clang++-3.6",
- "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0",
- "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot"
- },
- "name": "gsutil upload line-by-line coverage data",
- "~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-infra/coverage-json-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/coverage_by_line_164710_1408633190.json@@@"
- ]
+ "name": "Copy to swarming out (2)"
},
{
"name": "$result",
« no previous file with comments | « scripts/slave/recipes/skia/swarm_test.py ('k') | scripts/slave/recipes/skia/swarm_trigger.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698