Clean up no-longer-used recipes stuff
- Remove buildbot logic
- Remove non-Gerrit logic
- Remove master, slave, and build number properties
Bug: skia:6473
Change-Id: I203d523f3a0e03f933c0c48d29c7aabac503b2b9
Reviewed-on: https://skia-review.googlesource.com/12625
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index ece37ba..36575aa 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -609,9 +609,7 @@
# Run DM.
properties = [
'gitHash', api.vars.got_revision,
- 'master', api.vars.master_name,
'builder', api.vars.builder_name,
- 'build_number', api.vars.build_number,
]
if api.vars.is_trybot:
properties.extend([
@@ -619,10 +617,8 @@
'patchset', api.vars.patchset,
'patch_storage', api.vars.patch_storage,
])
- if api.vars.no_buildbot:
- properties.extend(['no_buildbot', 'True'])
- properties.extend(['swarming_bot_id', api.vars.swarming_bot_id])
- properties.extend(['swarming_task_id', api.vars.swarming_task_id])
+ properties.extend(['swarming_bot_id', api.vars.swarming_bot_id])
+ properties.extend(['swarming_task_id', api.vars.swarming_task_id])
args = [
'dm',
@@ -708,103 +704,95 @@
api.run.check_failure()
-TEST_BUILDERS = {
- 'client.skia': {
- 'skiabot-linux-swarm-000': [
- 'Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android',
- 'Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android',
- 'Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android',
- 'Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android',
- 'Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android',
- 'Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android',
- 'Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android',
- 'Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android',
- 'Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android',
- 'Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan',
- 'Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android',
- 'Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android',
- ('Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-'
- 'GN_Android_Vulkan'),
- 'Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android',
- 'Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug',
- 'Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug',
- 'Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug',
- 'Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer',
- 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug',
- 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug',
- 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN',
- 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN',
- 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared',
- 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN',
- 'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
- ('Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind' +
- '_AbandonGpuContext'),
- ('Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind' +
- '_PreAbandonGpuContext'),
- 'Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan',
- 'Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release',
- 'Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug',
- 'Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug',
- 'Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan',
- 'Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE',
- 'Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan',
- 'Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan',
- 'Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan',
- 'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot',
- 'Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE',
- 'Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release',
- ('Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_' +
- 'SCALEDIMAGECACHE'),
- ],
- },
-}
+TEST_BUILDERS = [
+ 'Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android',
+ 'Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android',
+ 'Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android',
+ 'Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android',
+ 'Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android',
+ 'Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android',
+ 'Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android',
+ 'Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android',
+ 'Test-Android-Clang-Nexus6-GPU-Adreno420-arm-Debug-GN_Android',
+ 'Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan',
+ 'Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android',
+ 'Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-GN_Android',
+ ('Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-'
+ 'GN_Android_Vulkan'),
+ 'Test-Android-Clang-PixelC-GPU-TegraX1-arm64-Debug-GN_Android',
+ 'Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug',
+ 'Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug',
+ 'Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug',
+ 'Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer',
+ 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug',
+ 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug',
+ 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN',
+ 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN',
+ 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared',
+ 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN',
+ 'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
+ ('Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind' +
+ '_AbandonGpuContext'),
+ ('Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind' +
+ '_PreAbandonGpuContext'),
+ 'Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan',
+ 'Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release',
+ 'Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug',
+ 'Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug',
+ 'Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan',
+ 'Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE',
+ 'Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan',
+ 'Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan',
+ 'Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan',
+ 'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot',
+ 'Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE',
+ 'Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release',
+ ('Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_' +
+ 'SCALEDIMAGECACHE'),
+]
def GenTests(api):
- for mastername, slaves in TEST_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',
- path_config='kitchen',
- swarm_out_dir='[SWARM_OUT_DIR]') +
- api.path.exists(
- api.path['start_dir'].join('skia'),
- api.path['start_dir'].join('skia', 'infra', 'bots', 'assets',
- 'skimage', 'VERSION'),
- api.path['start_dir'].join('skia', 'infra', 'bots', 'assets',
- 'skp', 'VERSION'),
- api.path['start_dir'].join('skia', 'infra', 'bots', 'assets',
- 'svg', 'VERSION'),
- api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt')
- )
- )
- 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)
+ for builder in TEST_BUILDERS:
+ test = (
+ api.test(builder) +
+ api.properties(buildername=builder,
+ revision='abc123',
+ path_config='kitchen',
+ swarm_out_dir='[SWARM_OUT_DIR]') +
+ api.path.exists(
+ api.path['start_dir'].join('skia'),
+ api.path['start_dir'].join('skia', 'infra', 'bots', 'assets',
+ 'skimage', 'VERSION'),
+ api.path['start_dir'].join('skia', 'infra', 'bots', 'assets',
+ 'skp', 'VERSION'),
+ api.path['start_dir'].join('skia', 'infra', 'bots', 'assets',
+ 'svg', 'VERSION'),
+ api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt')
+ )
+ )
+ if 'Trybot' in builder:
+ test += api.properties(patch_storage='gerrit')
+ test += api.properties.tryserver(
+ buildername=builder,
+ gerrit_project='skia',
+ gerrit_url='https://skia-review.googlesource.com/',
+ )
+ if 'Win' in builder:
+ test += api.platform('win', 64)
- if 'ChromeOS' in builder:
- test += api.step_data('read chromeos ip',
- stdout=api.raw_io.output('{"user_ip":"foo@127.0.0.1"}'))
+ if 'ChromeOS' in builder:
+ test += api.step_data(
+ 'read chromeos ip',
+ stdout=api.raw_io.output('{"user_ip":"foo@127.0.0.1"}'))
- yield test
+ yield test
builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug'
yield (
api.test('failed_dm') +
api.properties(buildername=builder,
- mastername='client.skia',
- slavename='skiabot-linux-swarm-000',
- buildnumber=6,
revision='abc123',
path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]') +
@@ -825,9 +813,6 @@
yield (
api.test('failed_get_hashes') +
api.properties(buildername=builder,
- mastername='client.skia',
- slavename='skiabot-linux-swarm-000',
- buildnumber=6,
revision='abc123',
path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]') +
@@ -844,80 +829,10 @@
api.step_data('get uninteresting hashes', retcode=1)
)
- builder = 'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot'
- yield (
- api.test('big_issue_number') +
- api.properties(buildername=builder,
- mastername='client.skia.compile',
- slavename='skiabot-linux-swarm-000',
- buildnumber=5,
- revision='abc123',
- path_config='kitchen',
- swarm_out_dir='[SWARM_OUT_DIR]',
- rietveld='https://codereview.chromium.org',
- patchset=1,
- issue=2147533002L) +
- api.path.exists(
- api.path['start_dir'].join('skia'),
- api.path['start_dir'].join('skia', 'infra', 'bots', 'assets',
- 'skimage', 'VERSION'),
- api.path['start_dir'].join('skia', 'infra', 'bots', 'assets',
- 'skp', 'VERSION'),
- api.path['start_dir'].join('skia', 'infra', 'bots', 'assets',
- 'svg', 'VERSION'),
- api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt')
- ) +
- api.platform('win', 64)
- )
-
- builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug-Trybot'
- yield (
- api.test('recipe_with_gerrit_patch') +
- api.properties(
- buildername=builder,
- mastername='client.skia',
- slavename='skiabot-linux-swarm-000',
- buildnumber=5,
- path_config='kitchen',
- swarm_out_dir='[SWARM_OUT_DIR]',
- revision='abc123',
- patch_storage='gerrit') +
- api.properties.tryserver(
- buildername=builder,
- gerrit_project='skia',
- gerrit_url='https://skia-review.googlesource.com/',
- )
- )
-
- yield (
- api.test('nobuildbot') +
- api.properties(
- buildername=builder,
- mastername='client.skia',
- slavename='skiabot-linux-swarm-000',
- buildnumber=5,
- path_config='kitchen',
- swarm_out_dir='[SWARM_OUT_DIR]',
- revision='abc123',
- nobuildbot='True',
- patch_storage='gerrit') +
- api.properties.tryserver(
- buildername=builder,
- gerrit_project='skia',
- gerrit_url='https://skia-review.googlesource.com/',
- ) +
- api.step_data('get swarming bot id',
- stdout=api.raw_io.output('skia-bot-123')) +
- api.step_data('get swarming task id', stdout=api.raw_io.output('123456'))
- )
-
builder = 'Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Debug-GN_Android'
yield (
api.test('failed_push') +
api.properties(buildername=builder,
- mastername='client.skia',
- slavename='skiabot-linux-swarm-000',
- buildnumber=6,
revision='abc123',
path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]') +
@@ -939,9 +854,6 @@
yield (
api.test('failed_pull') +
api.properties(buildername=builder,
- mastername='client.skia',
- slavename='skiabot-linux-swarm-000',
- buildnumber=6,
revision='abc123',
path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]') +