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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/swarm_test.expected/big_issue_number.json

Issue 2162563002: [Skia] Convert Sk Images to a CIPD package (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Fix whitespace 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 | « scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json ('k') | scripts/slave/recipes/skia/swarm_test.expected/download_and_push_skimage.json » ('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/big_issue_number.json
diff --git a/scripts/slave/recipes/skia/swarm_test.expected/big_issue_number.json b/scripts/slave/recipes/skia/swarm_test.expected/big_issue_number.json
index 24361733deafb16fc25127e1bee7a750210e35be..e942c0d5aa2d72dadc513c663b2fcd6fb8551f7c 100644
--- a/scripts/slave/recipes/skia/swarm_test.expected/big_issue_number.json
+++ b/scripts/slave/recipes/skia/swarm_test.expected/big_issue_number.json
@@ -3,142 +3,36 @@
"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",
- "[CUSTOM_C:\\_B_WORK]",
- "511"
- ],
- "name": "makedirs checkout_path",
- "~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",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "config",
- "--spec",
- "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
- ],
- "cwd": "[CUSTOM_C:\\_B_WORK]",
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
- "PYTHONPATH": "[BUILD]\\scripts"
- },
- "name": "gclient setup"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILD]\\scripts\\slave\\gclient_safe_revert.py",
- ".",
- "[DEPOT_TOOLS]\\gclient.bat"
- ],
- "cwd": "[CUSTOM_C:\\_B_WORK]",
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
- "PYTHONPATH": "[BUILD]\\scripts"
- },
- "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": "[CUSTOM_C:\\_B_WORK]",
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
- "PYTHONPATH": "[BUILD]\\scripts"
- },
- "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",
- "[CUSTOM_C:\\_B_WORK]\\skia",
- "-i",
- "2147533002",
- "-p",
- "1",
- "-s",
- "https://codereview.chromium.org",
- "--no-auth"
- ],
- "name": "apply_issue",
- "~followup_annotations": [
- "@@@STEP_LINK@Applied issue 2147533002@https://codereview.chromium.org/2147533002@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "[CUSTOM_C:\\_B_WORK]\\skia\\tools\\buildbot_spec.py",
+ "[SLAVE_BUILD]\\skia\\tools\\buildbot_spec.py",
"/path/to/tmp/json",
- "Build-Win-MSVC-x86-Debug"
+ "Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot"
],
- "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
+ "cwd": "[SLAVE_BUILD]\\skia",
"name": "exec buildbot_spec.py",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"most\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": true, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"model\": \"ShuttleB\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win8\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release_x64\", @@@",
"@@@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_perf_steps\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"env\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@",
"@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@",
@@ -164,10 +58,20 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION",
+ "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skimage\\VERSION",
"/path/to/tmp/"
],
- "name": "Get downloaded SK_IMAGE_VERSION"
+ "name": "Get downloaded skimage VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "42",
+ "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION"
+ ],
+ "name": "write SK_IMAGE_VERSION"
},
{
"cmd": [
@@ -242,14 +146,13 @@
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt"
],
- "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
+ "cwd": "[SLAVE_BUILD]\\skia",
"env": {
- "BUILDTYPE": "Debug",
+ "BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
- "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
+ "GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp",
"PYTHONPATH": "[BUILD]\\scripts",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
+ "SKIA_OUT": "[SLAVE_BUILD]\\out"
},
"name": "get uninteresting hashes",
"~followup_annotations": [
@@ -288,48 +191,58 @@
},
{
"cmd": [
- "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug\\dm",
+ "[SLAVE_BUILD]\\out\\Release_x64\\dm",
"--undefok",
"--resourcePath",
- "[CUSTOM_C:\\_B_WORK]\\skia\\resources",
+ "[SLAVE_BUILD]\\skia\\resources",
"--skps",
"[SLAVE_BUILD]\\skps",
"--images",
- "[SLAVE_BUILD]\\images\\dm",
+ "[SLAVE_BUILD]\\skimage\\dm",
"--nameByHash",
"--properties",
"gitHash",
- "164710",
+ "abc123",
"master",
"client.skia.compile",
"builder",
- "Build-Win-MSVC-x86-Debug",
+ "Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot",
"build_number",
"5",
+ "issue",
+ "2147533002",
+ "patchset",
+ "1",
"--colorImages",
- "[SLAVE_BUILD]\\images\\colorspace",
+ "[SLAVE_BUILD]\\skimage\\colorspace",
"--key",
+ "arch",
+ "x86_64",
"compiler",
"MSVC",
"configuration",
- "Debug",
+ "Release",
+ "cpu_or_gpu",
+ "CPU",
+ "cpu_or_gpu_value",
+ "AVX2",
+ "model",
+ "ShuttleB",
"os",
- "Win",
- "target_arch",
- "x86",
+ "Win8",
"--uninterestingHashesFile",
"[SLAVE_BUILD]\\tmp\\uninteresting_hashes.txt",
"--writePath",
"[CUSTOM_[SWARM_OUT_DIR]]\\dm",
+ "--nogpu",
"--dummy-flags"
],
"env": {
- "BUILDTYPE": "Debug",
+ "BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
- "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
+ "GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp",
"PYTHONPATH": "[BUILD]\\scripts",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
+ "SKIA_OUT": "[SLAVE_BUILD]\\out"
},
"name": "dm"
},
« no previous file with comments | « scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json ('k') | scripts/slave/recipes/skia/swarm_test.expected/download_and_push_skimage.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698