Roll Recipe DEPS
BUG=skia:
Change-Id: Ic89d1b49aba842fb41c82ad6fc8f5ebe787893bd
Reviewed-on: https://skia-review.googlesource.com/9884
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
diff --git a/infra/bots/recipe_modules/sktest/__init__.py b/infra/bots/recipe_modules/sktest/__init__.py
index 578c162..c97fd57 100644
--- a/infra/bots/recipe_modules/sktest/__init__.py
+++ b/infra/bots/recipe_modules/sktest/__init__.py
@@ -11,6 +11,7 @@
'recipe_engine/properties',
'recipe_engine/python',
'recipe_engine/raw_io',
+ 'recipe_engine/step',
'flavor',
'run',
'vars',
diff --git a/infra/bots/recipe_modules/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py
index e2ebbf6..bbc8844 100644
--- a/infra/bots/recipe_modules/sktest/api.py
+++ b/infra/bots/recipe_modules/sktest/api.py
@@ -511,7 +511,6 @@
time.sleep(waittime)
""",
args=[host_hashes_file],
- cwd=api.vars.skia_dir,
abort_on_failure=False,
fail_build_on_failure=False,
infra_step=True)
@@ -600,9 +599,8 @@
if '_PreAbandonGpuContext' in api.vars.builder_cfg.get('extra_config', ''):
args.append('--preAbandonGpuContext')
- api.run(api.flavor.step, 'dm', cmd=args,
- abort_on_failure=False,
- env=env)
+ with api.step.context({'env': env}):
+ api.run(api.flavor.step, 'dm', cmd=args, abort_on_failure=False)
if api.vars.upload_dm_results:
# Copy images and JSON to host machine if needed.
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json
index d138295..c790308 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json
@@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -465,7 +461,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json
index e7c6f93..27dc3d2 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android.json
@@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -465,7 +461,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android.json
index 0230d7e..b360da4 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android.json
@@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -465,7 +461,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json
index 2a17c71..e6a5213 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json
@@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -465,7 +461,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json
index ab59750..ca3e256 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json
@@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -465,7 +461,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android.json
index 93c4249..c1cf17f 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android.json
@@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -465,7 +461,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json
index 054d789..3e8aefb 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android.json
@@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -465,7 +461,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json
index fdc3602..773bc8c 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android.json
@@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -465,7 +461,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json
index fd9cf02..a314f4d 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json
@@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -465,7 +461,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json
index ab8beaa..eda0796 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android.json
@@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -465,7 +461,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json
index 21faa61..2f2ec29 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan.json
@@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -465,7 +461,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json
index b83fae5..77b1947 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android.json
@@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -465,7 +461,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json
index 404aaba..d34620a 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android.json
@@ -70,7 +70,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -170,7 +169,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -281,7 +279,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -392,7 +389,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -516,7 +512,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json
index 60fb604..72eb177 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan.json
@@ -70,7 +70,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -170,7 +169,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -281,7 +279,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -392,7 +389,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -516,7 +512,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json
index 4892117..4c45342 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android.json
@@ -70,7 +70,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -170,7 +169,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -281,7 +279,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -392,7 +389,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -516,7 +512,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json
index 1504c38..52ec330 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]/out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
@@ -617,7 +611,6 @@
"_",
"blurcircles"
],
- "cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
index 33e59c2..f186bc4 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]/out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
@@ -519,7 +513,6 @@
"_",
"complexclip4_aa"
],
- "cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json
index 52ba785..60d7c97 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]/out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
@@ -414,7 +408,6 @@
"_",
".SRW"
],
- "cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
index 5609dc5..1bec57b 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]/out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
index 7762bb2..26c08c7 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
@@ -423,7 +423,6 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"LSAN_OPTIONS": "symbolize=1 print_suppressions=1",
- "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin",
"SKIA_OUT": "[START_DIR]/out",
"UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1"
},
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
index 9738288..8aff2e9 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
@@ -425,7 +425,6 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"LD_LIBRARY_PATH": "[START_DIR]/clang_linux/msan",
- "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "symbolized dm"
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
index 74f6b06..db80beb 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]/out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
index 52b76cd..38fb08a 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]/out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
index ba82bda..cc831b0 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
@@ -425,7 +425,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "symbolized dm"
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json
index 6f00416..95279d8 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]/out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
index 0d2439e..92d070b 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]/out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json
index d320735..034a6c1 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]/out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
index 42a0173..6060e54 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]\\tmp\\uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]\\skia",
- "env": {
- "BUILDTYPE": "Debug_x64",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]\\out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
@@ -376,7 +370,6 @@
"~ReadWriteAlpha",
"~XfermodeImageFilterCroppedInput_Gpu"
],
- "cwd": "[START_DIR]\\skia",
"env": {
"BUILDTYPE": "Debug_x64",
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json
index db1da2d..5bce991 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]\\tmp\\uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]\\skia",
- "env": {
- "BUILDTYPE": "Debug_x64",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]\\out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
@@ -440,7 +434,6 @@
"~GLPrograms",
"~IntTexture"
],
- "cwd": "[START_DIR]\\skia",
"env": {
"BUILDTYPE": "Debug_x64",
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
index 9a10db0..d5383b0 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]\\tmp\\uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]\\skia",
- "env": {
- "BUILDTYPE": "Debug_x64",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]\\out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
@@ -370,7 +364,6 @@
"_",
".SRW"
],
- "cwd": "[START_DIR]\\skia",
"env": {
"BUILDTYPE": "Debug_x64",
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
index 269f77d..14a12c2 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]\\tmp\\uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]\\skia",
- "env": {
- "BUILDTYPE": "Debug_x64",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]\\out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
@@ -372,7 +366,6 @@
"--match",
"~GPUMemorySize"
],
- "cwd": "[START_DIR]\\skia",
"env": {
"BUILDTYPE": "Debug_x64",
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
index 8a24ace..fe347f1 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]\\tmp\\uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]\\skia",
- "env": {
- "BUILDTYPE": "Release_x64",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]\\out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
@@ -508,7 +502,6 @@
"complexclip4_aa",
"--noRAW_threading"
],
- "cwd": "[START_DIR]\\skia",
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
index 3c5fa23..1df8deb 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]\\tmp\\uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]\\skia",
- "env": {
- "BUILDTYPE": "Debug_x64",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]\\out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
@@ -384,7 +378,6 @@
"~GLPrograms",
"--noRAW_threading"
],
- "cwd": "[START_DIR]\\skia",
"env": {
"BUILDTYPE": "Debug_x64",
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
index 8966429..ebcd2bd 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
@@ -5,12 +5,6 @@
"[START_DIR]/skia/resources",
"resources"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "push_if_needed [START_DIR]/skia/resources"
},
{
@@ -40,12 +34,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"tmp/SKP_VERSION"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "cat_file tmp/SKP_VERSION",
"stdout": "/path/to/tmp/"
},
@@ -54,12 +42,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"tmp/SKP_VERSION"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "rm tmp/SKP_VERSION"
},
{
@@ -67,12 +49,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"skps"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "rm skps"
},
{
@@ -80,12 +56,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"skps"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "mkdir skps"
},
{
@@ -94,12 +64,6 @@
"[START_DIR]/skp",
"skps"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "push_if_needed [START_DIR]/skp"
},
{
@@ -108,12 +72,6 @@
"[START_DIR]/tmp/SKP_VERSION",
"tmp/SKP_VERSION"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "push_file [START_DIR]/tmp/SKP_VERSION"
},
{
@@ -143,12 +101,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"tmp/SK_IMAGE_VERSION"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "cat_file tmp/SK_IMAGE_VERSION",
"stdout": "/path/to/tmp/"
},
@@ -157,12 +109,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"tmp/SK_IMAGE_VERSION"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "rm tmp/SK_IMAGE_VERSION"
},
{
@@ -170,12 +116,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"images"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "rm images"
},
{
@@ -183,12 +123,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"images"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "mkdir images"
},
{
@@ -197,12 +131,6 @@
"[START_DIR]/skimage",
"images"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "push_if_needed [START_DIR]/skimage"
},
{
@@ -211,12 +139,6 @@
"[START_DIR]/tmp/SK_IMAGE_VERSION",
"tmp/SK_IMAGE_VERSION"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION"
},
{
@@ -246,12 +168,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_cat_file",
"tmp/SVG_VERSION"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "cat_file tmp/SVG_VERSION",
"stdout": "/path/to/tmp/"
},
@@ -260,12 +176,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"tmp/SVG_VERSION"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "rm tmp/SVG_VERSION"
},
{
@@ -273,12 +183,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"svgs"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "rm svgs"
},
{
@@ -286,12 +190,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"svgs"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "mkdir svgs"
},
{
@@ -300,12 +198,6 @@
"[START_DIR]/svg",
"svgs"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "push_if_needed [START_DIR]/svg"
},
{
@@ -314,12 +206,6 @@
"[START_DIR]/tmp/SVG_VERSION",
"tmp/SVG_VERSION"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "push_file [START_DIR]/tmp/SVG_VERSION"
},
{
@@ -364,12 +250,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_rm",
"dm"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "rm dm"
},
{
@@ -377,12 +257,6 @@
"[START_DIR]/skia/platform_tools/ios/bin/ios_mkdir",
"dm"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "mkdir dm"
},
{
@@ -415,13 +289,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
@@ -464,12 +331,6 @@
"[START_DIR]/tmp/uninteresting_hashes.txt",
"tmp/uninteresting_hashes.txt"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "push_file [START_DIR]/tmp/uninteresting_hashes.txt"
},
{
@@ -479,7 +340,6 @@
"[START_DIR]/skia/gn/package_ios.py",
"[START_DIR]/out/Release/dm"
],
- "cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
@@ -498,7 +358,6 @@
"--args",
"--undefok --resourcePath resources --skps skps --images images/dm --colorImages images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release build_number 5 --svgs svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS --uninterestingHashesFile tmp/uninteresting_hashes.txt --writePath dm --nocpu --config 8888 srgb pdf gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ 8888 image _ _ gles skp _ _ _ image gen_platf rgba32abf.bmp _ image gen_platf rgb24prof.bmp _ image gen_platf rgb24lprof.bmp _ image gen_platf 8bpp-pixeldata-cropped.bmp _ image gen_platf 4bpp-pixeldata-cropped.bmp _ image gen_platf 32bpp-pixeldata-cropped.bmp _ image gen_platf 24bpp-pixeldata-cropped.bmp _ image gen_platf frame_larger_than_image.gif _ image gen_platf inc0.png _ image gen_platf inc1.png _ image gen_platf inc2.png _ image gen_platf inc3.png _ image gen_platf inc4.png _ image gen_platf inc5.png _ image gen_platf inc6.png _ image gen_platf inc7.png _ image gen_platf inc8.png _ image gen_platf inc9.png _ image gen_platf inc10.png _ image gen_platf inc11.png _ image gen_platf inc12.png _ image gen_platf inc13.png _ image gen_platf inc14.png _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW"
],
- "cwd": "[START_DIR]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
@@ -513,12 +372,6 @@
"dm",
"[CUSTOM_[SWARM_OUT_DIR]]/dm"
],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "IOS_BUNDLE_ID": "com.google.dm",
- "SKIA_OUT": "[START_DIR]/out"
- },
"name": "pull_if_needed dm"
},
{
diff --git a/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json b/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json
index 546ff16..957dd6a 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]\\tmp\\uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]\\skia",
- "env": {
- "BUILDTYPE": "Release_x64",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]\\out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
@@ -508,7 +502,6 @@
"complexclip4_aa",
"--noRAW_threading"
],
- "cwd": "[START_DIR]\\skia",
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
index 4712f94..8482f9d 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]/out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_get_hashes.json b/infra/bots/recipe_modules/sktest/example.expected/failed_get_hashes.json
index 0c71107..65ad219 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/failed_get_hashes.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/failed_get_hashes.json
@@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -465,7 +461,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_pull.json b/infra/bots/recipe_modules/sktest/example.expected/failed_pull.json
index 74c086d..48406f7 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/failed_pull.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/failed_pull.json
@@ -19,7 +19,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
@@ -119,7 +118,6 @@
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
"~followup_annotations": [
@@ -230,7 +228,6 @@
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
"~followup_annotations": [
@@ -341,7 +338,6 @@
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
"~followup_annotations": [
@@ -465,7 +461,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_push.json b/infra/bots/recipe_modules/sktest/example.expected/failed_push.json
index 8bc41ec..5f7f94f 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/failed_push.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/failed_push.json
@@ -70,7 +70,6 @@
"[START_DIR]/skia/resources",
"/sdcard/revenge_of_the_skiabot/resources"
],
- "cwd": "[START_DIR]/skia",
"infra_step": true,
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
index b6b41a8..117673b 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]/out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [
diff --git a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
index d21e413..4226a3c 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
@@ -132,12 +132,6 @@
"\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",
"[START_DIR]/tmp/uninteresting_hashes.txt"
],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[START_DIR]/out"
- },
"infra_step": true,
"name": "get uninteresting hashes",
"~followup_annotations": [