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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/skia.py

Issue 1128823007: Skia recipes: Move Android and ChromeOS config info in from slaves.cfg (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 5 years, 7 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/recipe_modules/skia/ssh_flavor.py ('k') | scripts/slave/recipes/skia/skia.expected/Build-Ubuntu-GCC-x86_64-Debug.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/skia.py
diff --git a/scripts/slave/recipes/skia/skia.py b/scripts/slave/recipes/skia/skia.py
index 0f15394d6c39412f6b8098c0abb02fd17dd14b43..4479d2fc2cad5c88bed2a88fa6e448dedaf46fcd 100644
--- a/scripts/slave/recipes/skia/skia.py
+++ b/scripts/slave/recipes/skia/skia.py
@@ -7,7 +7,6 @@
from common.skia import builder_name_schema
-from slave.skia import slaves_cfg
DEPS = [
@@ -24,50 +23,46 @@ def GenSteps(api):
api.skia.gen_steps()
-def _getMasterAndSlaveForBuilder(builder):
- # Filesystem access is okay here because it is executed on the testing
- # machine.
- import os
-
- masters_path = os.path.join(os.path.realpath(os.path.dirname(__file__)),
- os.pardir, os.pardir, os.pardir, os.pardir,
- 'masters')
- adj_builder = builder_name_schema.GetWaterfallBot(builder)
- for master in os.listdir(masters_path):
- if master.startswith('master.client.skia'):
- adj_master = master[len('master.'):]
- slaves = slaves_cfg.get(adj_master)
- for slavename in slaves:
- if adj_builder in slaves[slavename]['builder']:
- return adj_master, slavename, slaves[slavename]
-
-
def GenTests(api):
borenet 2015/05/14 17:33:21 I replaced _getMasterAndSlaveForBuilder with this
- builders = [
- 'Build-Ubuntu-GCC-Arm7-Debug-CrOS_Daisy',
- 'Build-Ubuntu-GCC-x86_64-Debug',
- 'Build-Ubuntu-GCC-x86_64-Release-Mesa',
- 'Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release',
- 'Test-ChromeOS-GCC-Daisy-CPU-NEON-Arm7-Release',
- 'Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot',
- 'Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Debug',
- 'Test-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug',
- 'Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release',
- 'Test-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Debug',
- 'Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug',
- 'Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug',
- 'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
- 'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Debug-ZeroGPUCache',
- 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug',
- 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot',
- 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN',
- 'Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release',
- 'Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-ANGLE',
- 'Test-Win8-MSVC-ShuttleA-CPU-AVX-x86_64-Debug',
- 'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
- ]
+ builders = {
+ 'client.skia': {
+ 'skiabot-ipad4-000': [
+ 'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
+ ],
+ 'skiabot-linux-tester-000': [
+ 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN',
+ ],
+ 'skiabot-macmini-10_8-000': [
+ 'Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release',
+ ],
+ 'skiabot-shuttle-ubuntu12-003': [
+ 'Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug',
+ ],
+ 'skiabot-shuttle-ubuntu12-gtx550ti-001': [
+ 'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
+ 'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Debug-ZeroGPUCache',
+ ],
+ 'skiabot-shuttle-win7-intel-000': [
+ 'Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-ANGLE',
+ ],
+ 'skiabot-shuttle-win7-intel-bench': [
+ 'Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot',
+ ],
+ },
+ 'client.skia.android': {
+ 'skiabot-shuttle-ubuntu12-nexus7-001': [
+ 'Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release',
+ ],
+ },
+ 'client.skia.compile': {
+ 'skiabot-linux-compile-000': [
+ 'Build-Ubuntu-GCC-Arm7-Debug-CrOS_Daisy',
+ 'Build-Ubuntu-GCC-x86_64-Release-Mesa',
+ ],
+ },
+ }
- def AndroidTestData(builder, slave_cfg):
+ def AndroidTestData(builder):
test_data = (
api.step_data(
'get EXTERNAL_STORAGE dir',
@@ -92,47 +87,48 @@ def GenTests(api):
stdout=api.raw_io.output(''))
return test_data
- for builder in builders:
- mastername, slavename, slave_cfg = _getMasterAndSlaveForBuilder(builder)
- test = (
- api.test(builder) +
- api.properties(buildername=builder,
- mastername=mastername,
- slavename=slavename,
- buildnumber=5,
- revision='abc123') +
- api.path.exists(
- api.path['slave_build'].join('skia'),
- api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
- )
- )
- if 'Test' in builder:
- test += api.step_data('gsutil cat TIMESTAMP_LAST_UPLOAD_COMPLETED',
- stdout=api.raw_io.output('42'))
- if 'Android' in builder:
- test += api.step_data('has ccache?', retcode=1)
- if 'Android' in builder:
- test += AndroidTestData(builder, slave_cfg)
- if 'ChromeOS' in builder:
- test += api.step_data('read SKP_VERSION',
- stdout=api.raw_io.output('42'))
- if 'Test' in builder:
- test += api.step_data('read SKIMAGE_VERSION',
- stdout=api.raw_io.output('42'))
- if 'Trybot' in builder:
- test += api.properties(issue=500,
- patchset=1,
- rietveld='https://codereview.chromium.org')
- if 'Win' in builder:
- test += api.platform('win', 64)
- yield test
+ for mastername, slaves in builders.iteritems():
+ for slavename, builders_by_slave in slaves.iteritems():
+ for builder in builders_by_slave:
+ test = (
+ api.test(builder) +
+ api.properties(buildername=builder,
+ mastername=mastername,
+ slavename=slavename,
+ buildnumber=5,
+ revision='abc123') +
+ api.path.exists(
+ api.path['slave_build'].join('skia'),
+ api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
+ )
+ )
+ if 'Test' in builder:
+ test += api.step_data('gsutil cat TIMESTAMP_LAST_UPLOAD_COMPLETED',
+ stdout=api.raw_io.output('42'))
+ if 'Android' in builder:
+ test += api.step_data('has ccache?', retcode=1)
+ if 'Android' in builder:
+ test += AndroidTestData(builder)
+ if 'ChromeOS' in builder:
+ test += api.step_data('read SKP_VERSION',
+ stdout=api.raw_io.output('42'))
+ if 'Test' in builder:
+ test += api.step_data('read SKIMAGE_VERSION',
+ stdout=api.raw_io.output('42'))
+ if 'Trybot' in builder:
+ test += api.properties(issue=500,
+ patchset=1,
+ rietveld='https://codereview.chromium.org')
+ if 'Win' in builder:
+ test += api.platform('win', 64)
+ yield test
builder = 'Test-Ubuntu-GCC-ShuttleA-CPU-AVX-x86_64-Debug-Recipes'
yield (
api.test('failed_dm') +
api.properties(buildername=builder,
- mastername=mastername,
- slavename=slavename,
+ mastername='client.skia',
+ slavename='skiabot-linux-tester-000',
buildnumber=6) +
api.step_data('gsutil cat TIMESTAMP_LAST_UPLOAD_COMPLETED',
stdout=api.raw_io.output('42')) +
@@ -149,7 +145,8 @@ def GenTests(api):
)
builder = 'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug'
- master, slave, slave_cfg = _getMasterAndSlaveForBuilder(builder)
+ master = 'client.skia.android'
+ slave = 'skiabot-shuttle-ubuntu12-nexus7-001'
yield (
api.test('failed_get_hashes') +
api.properties(buildername=builder,
@@ -158,7 +155,7 @@ def GenTests(api):
buildnumber=6,
revision='abc123') +
api.step_data('has ccache?', retcode=1) +
- AndroidTestData(builder, slave_cfg) +
+ AndroidTestData(builder) +
api.step_data('read SKP_VERSION',
stdout=api.raw_io.output('42')) +
api.step_data('gsutil cat TIMESTAMP_LAST_UPLOAD_COMPLETED',
@@ -172,8 +169,6 @@ def GenTests(api):
)
)
- builder = 'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug'
- master, slave, slave_cfg = _getMasterAndSlaveForBuilder(builder)
yield (
api.test('download_and_push_skps') +
api.properties(buildername=builder,
@@ -183,7 +178,7 @@ def GenTests(api):
revision='abc123',
test_downloaded_skp_version='2') +
api.step_data('has ccache?', retcode=1) +
- AndroidTestData(builder, slave_cfg) +
+ AndroidTestData(builder) +
api.step_data('read SKP_VERSION',
stdout=api.raw_io.output('2')) +
api.step_data('gsutil cat TIMESTAMP_LAST_UPLOAD_COMPLETED',
@@ -199,43 +194,48 @@ def GenTests(api):
)
)
borenet 2015/05/14 17:33:21 I reordered some of the tests below so that they'r
- builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug'
- master, slave, slave_cfg = _getMasterAndSlaveForBuilder(builder)
yield (
- api.test('missing_SKP_VERSION_host') +
+ api.test('missing_SKP_VERSION_device') +
api.properties(buildername=builder,
mastername=master,
slavename=slave,
buildnumber=6,
revision='abc123') +
- api.step_data('Get downloaded SKP_VERSION', retcode=1) +
+ api.step_data('has ccache?', retcode=1) +
+ AndroidTestData(builder) +
+ api.step_data('read SKP_VERSION',
+ retcode=1) +
api.step_data('gsutil cat TIMESTAMP_LAST_UPLOAD_COMPLETED',
stdout=api.raw_io.output('42')) +
+ api.step_data('read SKIMAGE_VERSION',
+ stdout=api.raw_io.output('42')) +
+ api.step_data(
+ 'exists skps',
+ stdout=api.raw_io.output('')) +
api.path.exists(
api.path['slave_build'].join('skia'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
)
)
- builder = 'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug'
- master, slave, slave_cfg = _getMasterAndSlaveForBuilder(builder)
yield (
- api.test('missing_SKP_VERSION_device') +
+ api.test('download_and_push_skimage') +
api.properties(buildername=builder,
mastername=master,
slavename=slave,
buildnumber=6,
- revision='abc123') +
+ revision='abc123',
+ test_downloaded_skimage_version='2') +
api.step_data('has ccache?', retcode=1) +
- AndroidTestData(builder, slave_cfg) +
+ AndroidTestData(builder) +
api.step_data('read SKP_VERSION',
- retcode=1) +
+ stdout=api.raw_io.output('42')) +
api.step_data('gsutil cat TIMESTAMP_LAST_UPLOAD_COMPLETED',
stdout=api.raw_io.output('42')) +
api.step_data('read SKIMAGE_VERSION',
- stdout=api.raw_io.output('42')) +
+ stdout=api.raw_io.output('2')) +
api.step_data(
- 'exists skps',
+ 'exists skia_images',
stdout=api.raw_io.output('')) +
api.path.exists(
api.path['slave_build'].join('skia'),
@@ -243,24 +243,21 @@ def GenTests(api):
)
)
- builder = 'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug'
- master, slave, slave_cfg = _getMasterAndSlaveForBuilder(builder)
yield (
- api.test('download_and_push_skimage') +
+ api.test('missing_SKIMAGE_VERSION_device') +
api.properties(buildername=builder,
mastername=master,
slavename=slave,
buildnumber=6,
- revision='abc123',
- test_downloaded_skimage_version='2') +
+ revision='abc123') +
api.step_data('has ccache?', retcode=1) +
- AndroidTestData(builder, slave_cfg) +
+ AndroidTestData(builder) +
api.step_data('read SKP_VERSION',
stdout=api.raw_io.output('42')) +
api.step_data('gsutil cat TIMESTAMP_LAST_UPLOAD_COMPLETED',
stdout=api.raw_io.output('42')) +
api.step_data('read SKIMAGE_VERSION',
- stdout=api.raw_io.output('2')) +
+ retcode=1) +
api.step_data(
'exists skia_images',
stdout=api.raw_io.output('')) +
@@ -271,43 +268,34 @@ def GenTests(api):
)
builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug'
- master, slave, slave_cfg = _getMasterAndSlaveForBuilder(builder)
+ master = 'client.skia'
+ slave = 'skiabot-linux-test-000'
yield (
- api.test('missing_SKIMAGE_VERSION_host') +
+ api.test('missing_SKP_VERSION_host') +
api.properties(buildername=builder,
mastername=master,
slavename=slave,
buildnumber=6,
revision='abc123') +
+ api.step_data('Get downloaded SKP_VERSION', retcode=1) +
api.step_data('gsutil cat TIMESTAMP_LAST_UPLOAD_COMPLETED',
stdout=api.raw_io.output('42')) +
- api.step_data('Get downloaded SKIMAGE_VERSION', retcode=1) +
api.path.exists(
api.path['slave_build'].join('skia'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
)
)
- builder = 'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug'
- master, slave, slave_cfg = _getMasterAndSlaveForBuilder(builder)
yield (
- api.test('missing_SKIMAGE_VERSION_device') +
+ api.test('missing_SKIMAGE_VERSION_host') +
api.properties(buildername=builder,
mastername=master,
slavename=slave,
buildnumber=6,
revision='abc123') +
- api.step_data('has ccache?', retcode=1) +
- AndroidTestData(builder, slave_cfg) +
- api.step_data('read SKP_VERSION',
- stdout=api.raw_io.output('42')) +
api.step_data('gsutil cat TIMESTAMP_LAST_UPLOAD_COMPLETED',
stdout=api.raw_io.output('42')) +
- api.step_data('read SKIMAGE_VERSION',
- retcode=1) +
- api.step_data(
- 'exists skia_images',
- stdout=api.raw_io.output('')) +
+ api.step_data('Get downloaded SKIMAGE_VERSION', retcode=1) +
api.path.exists(
api.path['slave_build'].join('skia'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
« no previous file with comments | « scripts/slave/recipe_modules/skia/ssh_flavor.py ('k') | scripts/slave/recipes/skia/skia.expected/Build-Ubuntu-GCC-x86_64-Debug.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698