Skip to content

A
angle
Commit 1bdd34ff by Jamie Madill Committed by Commit Bot
Options

infra: Add test specs for standalone tests.

Includes test specs for Linux/Mac/Win7/Win10. Android is left out for a second pass to keep the changes a bit simpler. Bug: angleproject:5114 Change-Id: I94e7f7f273073f85488ec982e89b4b68f45627ac Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2805371 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent 61167d52
Showing with 290 additions and 5 deletions
infra/config/generated/project.pyl 0 → 100644
# This is a non-LUCI generated file
# This is consumed by presubmit checks that need to validate the config
{"validate_source_side_specs_have_builder": False}
infra/config/main.star
...@@ -41,6 +41,19 @@ luci.project( ...@@ -41,6 +41,19 @@ luci.project(
] ]
) )
def _generate_project_pyl(ctx):
ctx.output["project.pyl"] = "\n".join([
"# This is a non-LUCI generated file",
"# This is consumed by presubmit checks that need to validate the config",
repr(dict(
# We don't validate matching source-side configs for simplicity.
validate_source_side_specs_have_builder = False,
)),
"",
])
lucicfg.generator(_generate_project_pyl)
luci.milo( luci.milo(
logo = "https://storage.googleapis.com/chrome-infra/OpenGL%20ES_RGB_June16.svg", logo = "https://storage.googleapis.com/chrome-infra/OpenGL%20ES_RGB_June16.svg",
monorail_project = "angleproject", monorail_project = "angleproject",
......
infra/specs/generate_test_spec_json.py 0 → 100755
#!/usr/bin/env python
# Copyright 2021 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Script to generate the test spec JSON files. Calls Chromium's generate_buildbot_json.
"""
import os
import sys
import subprocess
d = os.path.dirname
THIS_DIR = d(os.path.abspath(__file__))
TESTING_DIR = os.path.join(d(d(THIS_DIR)), 'testing', 'buildbot')
sys.path.insert(0, TESTING_DIR)
import generate_buildbot_json
if __name__ == '__main__': # pragma: no cover
# Append the path to the isolate map.
override_args = sys.argv[1:] + ['--pyl-files-dir', THIS_DIR]
parsed_args = generate_buildbot_json.BBJSONGenerator.parse_args(override_args)
generator = generate_buildbot_json.BBJSONGenerator(parsed_args)
sys.exit(generator.main())
infra/specs/mixins.pyl
...@@ -10,4 +10,119 @@ ...@@ -10,4 +10,119 @@
# #
# For more info see Chromium's mixins.pyl in testing/buildbot. # For more info see Chromium's mixins.pyl in testing/buildbot.
{} {
\ No newline at end of file 'angle_skia_gold_test': {
'$mixin_append': {
'args': [
'--git-revision=${got_angle_revision}',
# BREAK GLASS IN CASE OF EMERGENCY
# Uncommenting this argument will bypass all interactions with Skia
# Gold in any tests that use it. This is meant as a temporary
# emergency stop in case of a Gold outage that's affecting the bots.
# '--bypass-skia-gold-functionality',
],
'precommit_args': [
'--gerrit-issue=${patch_issue}',
'--gerrit-patchset=${patch_set}',
'--buildbucket-id=${buildbucket_build_id}',
],
}
},
'chrome-gpu-gold-service-account': {
'swarming': {
'service_account': 'chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com',
},
},
'chromium-tester-service-account': {
'swarming': {
'service_account': 'chromium-tester@chops-service-accounts.iam.gserviceaccount.com',
},
},
'linux_intel_hd_630_stable': {
'swarming': {
'dimensions': {
'gpu': '8086:5912-19.0.2',
'os': 'Ubuntu-19.04',
'pool': 'chromium.tests.gpu',
}
}
},
'linux_nvidia_quadro_p400_stable': {
'swarming': {
'dimensions': {
'gpu': '10de:1cb3-418.56',
'os': 'Ubuntu-19.04',
'pool': 'chromium.tests.gpu',
}
}
},
'mac_mini_intel_gpu_stable': {
'swarming': {
'dimensions': {
'gpu': '8086:0a2e',
'os': 'Mac-10.15.5',
},
},
},
'mac_retina_amd_gpu_stable': {
'swarming': {
'dimensions': {
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.14.6',
'pool': 'chromium.tests.gpu',
},
},
},
'mac_retina_nvidia_gpu_stable': {
'swarming': {
'dimensions': {
'gpu': '10de:0fe9',
'hidpi': '1',
'os': 'Mac-10.14.6',
'pool': 'chromium.tests.gpu',
},
},
},
'swarming_containment_auto': {
'swarming': {
'containment_type': 'AUTO',
},
},
'win10_intel_hd_630_stable': {
'swarming': {
'dimensions': {
'gpu': '8086:5912-26.20.100.8141|8086:3e92-26.20.100.8141',
'os': 'Windows-10',
'pool': 'chromium.tests.gpu',
},
},
},
'win10_nvidia_quadro_p400_stable': {
'swarming': {
'dimensions': {
'gpu': '10de:1cb3-27.21.14.5148',
'os': 'Windows-10-18363',
'pool': 'chromium.tests.gpu',
},
},
},
'win7_amd_r7_240': {
'swarming': {
'dimensions': {
'gpu': '1002:6613',
'os': 'Windows-2008ServerR2-SP1',
'pool': 'chromium.tests.gpu',
},
},
},
'win7_nvidia_quadro_p400': {
'swarming': {
'dimensions': {
'gpu': '10de:1cb3-24.21.14.1195',
'os': 'Windows-2008ServerR2-SP1',
'pool': 'chromium.tests.gpu',
},
},
},
}
infra/specs/test_suite_exceptions.pyl
...@@ -10,4 +10,35 @@ ...@@ -10,4 +10,35 @@
# #
# For more info see Chromium's test_suite_exceptions.pyl in testing/buildbot. # For more info see Chromium's test_suite_exceptions.pyl in testing/buildbot.
{} {
\ No newline at end of file 'angle_end2end_tests': {
'modifications': {
# anglebug.com/5328 suspecting blue screen caused by multiprocess
'linux-intel': {
'args': [
'--max-processes=1',
],
},
'win10-x64-intel': {
'args': [
'--max-processes=1',
],
},
},
},
'angle_white_box_tests': {
'modifications': {
# anglebug.com/5328 suspecting blue screen caused by multiprocess
'linux-intel': {
'args': [
'--max-processes=1',
],
},
'win10-x64-intel': {
'args': [
'--max-processes=1',
],
},
},
},
}
infra/specs/waterfalls.pyl
...@@ -10,4 +10,105 @@ ...@@ -10,4 +10,105 @@
# #
# For more info see Chromium's waterfalls.pyl in testing/buildbot. # For more info see Chromium's waterfalls.pyl in testing/buildbot.
[] [
{
'name': 'angle',
'forbid_script_tests': True,
'mixins': [
'chromium-tester-service-account',
'swarming_containment_auto',
],
'machines': {
'android-arm-builder': {},
'android-arm64-builder': {},
'linux-builder': {},
'linux-intel': {
'os_type': 'linux',
'mixins': [
'linux_intel_hd_630_stable',
],
'test_suites': {
'gtest_tests': 'linux_intel_gtests',
},
},
'linux-nvidia': {
'os_type': 'linux',
'mixins': [
'linux_nvidia_quadro_p400_stable',
],
'test_suites': {
'gtest_tests': 'linux_nvidia_gtests',
},
},
'mac-amd': {
'os_type': 'mac',
'mixins': [
'mac_retina_amd_gpu_stable',
],
'test_suites': {
'gtest_tests': 'mac_amd_and_intel_gtests',
},
},
'mac-builder': {},
'mac-intel': {
'os_type': 'mac',
'mixins': [
'mac_mini_intel_gpu_stable',
],
'test_suites': {
'gtest_tests': 'mac_amd_and_intel_gtests',
},
},
'mac-nvidia': {
'os_type': 'mac',
'mixins': [
'mac_retina_nvidia_gpu_stable',
],
'test_suites': {
# Fewer tests enabled on this config because of limited capacity.
'gtest_tests': 'mac_nvidia_gtests',
},
},
'win-x64-builder': {},
'win-x86-builder': {},
'win10-x64-intel': {
'os_type': 'win',
'mixins': [
'win10_intel_hd_630_stable',
],
'test_suites': {
'gtest_tests': 'win10_intel_gtests',
'isolated_scripts': 'common_isolated_scripts',
},
},
'win10-x64-nvidia': {
'os_type': 'win',
'mixins': [
'win10_nvidia_quadro_p400_stable',
],
'test_suites': {
'gtest_tests': 'win10_nvidia_gtests',
'isolated_scripts': 'common_isolated_scripts',
},
},
'win7-x64-nvidia': {
'os_type': 'win',
'mixins': [
'win7_nvidia_quadro_p400',
],
'test_suites': {
'gtest_tests': 'win7_nvidia_gtests',
},
},
'win7-x86-amd': {
'os_type': 'win',
'mixins': [
'win7_amd_r7_240',
],
'test_suites': {
'gtest_tests': 'win7_amd_gtests',
},
},
},
},
]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment