Skip to content

A
angle
Commit e61909f6 by Jamie Madill Committed by Commit Bot
Options

infra: Re-enable swarming tests.

Changes since the revert: - Include runtime_deps: http://crrev.com/c/2878093 - Add missing perf scripts: http://crrev.com/c/2877011 - Include build_properties: http://crrev.com/c/2878373 Bug: angleproject:5114 Change-Id: If7d1e5693c4ade72d3f45f5d60635cb27de7599e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2877012Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 39ba247d
Showing with 23 additions and 18 deletions
infra/specs/mixins.pyl
...@@ -13,7 +13,12 @@ ...@@ -13,7 +13,12 @@
# #
# For more info see Chromium's mixins.pyl in testing/buildbot. # For more info see Chromium's mixins.pyl in testing/buildbot.
{ 'chromium-tester-service-account': { 'swarming': { 'service_account': 'chromium-tester@chops-service-accounts.iam.gserviceaccount.com'}}, { 'angle_skia_gold_test': { '$mixin_append': { 'args': [ '--git-revision=${got_angle_revision}'],
'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', 'linux_intel_hd_630_stable': { 'swarming': { 'dimensions': { 'gpu': '8086:5912-19.0.2',
'os': 'Ubuntu-19.04', 'os': 'Ubuntu-19.04',
'pool': 'chromium.tests.gpu'}}}, 'pool': 'chromium.tests.gpu'}}},
......
infra/specs/waterfalls.pyl
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
'linux_intel_hd_630_stable', 'linux_intel_hd_630_stable',
], ],
'test_suites': { 'test_suites': {
# 'gtest_tests': 'linux_intel_gtests', 'gtest_tests': 'linux_intel_gtests',
# 'isolated_scripts': 'common_isolated_scripts', 'isolated_scripts': 'common_isolated_scripts',
}, },
}, },
'linux-nvidia': { 'linux-nvidia': {
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
'linux_nvidia_quadro_p400_stable', 'linux_nvidia_quadro_p400_stable',
], ],
'test_suites': { 'test_suites': {
# 'gtest_tests': 'linux_nvidia_gtests', 'gtest_tests': 'linux_nvidia_gtests',
# 'isolated_scripts': 'common_isolated_scripts', 'isolated_scripts': 'common_isolated_scripts',
}, },
}, },
'mac-amd': { 'mac-amd': {
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
'mac_retina_amd_gpu_stable', 'mac_retina_amd_gpu_stable',
], ],
'test_suites': { 'test_suites': {
# 'gtest_tests': 'mac_amd_and_intel_gtests', 'gtest_tests': 'mac_amd_and_intel_gtests',
}, },
}, },
'mac-builder': {}, 'mac-builder': {},
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
'mac_mini_intel_gpu_stable', 'mac_mini_intel_gpu_stable',
], ],
'test_suites': { 'test_suites': {
# 'gtest_tests': 'mac_amd_and_intel_gtests', 'gtest_tests': 'mac_amd_and_intel_gtests',
}, },
}, },
'mac-nvidia': { 'mac-nvidia': {
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
], ],
'test_suites': { 'test_suites': {
# Fewer tests enabled on this config because of limited capacity. # Fewer tests enabled on this config because of limited capacity.
# 'gtest_tests': 'mac_nvidia_gtests', 'gtest_tests': 'mac_nvidia_gtests',
}, },
}, },
'win-x64-builder': {}, 'win-x64-builder': {},
...@@ -81,8 +81,8 @@ ...@@ -81,8 +81,8 @@
'win10_intel_hd_630_stable', 'win10_intel_hd_630_stable',
], ],
'test_suites': { 'test_suites': {
# 'gtest_tests': 'win10_intel_gtests', 'gtest_tests': 'win10_intel_gtests',
# 'isolated_scripts': 'common_isolated_scripts', 'isolated_scripts': 'common_isolated_scripts',
}, },
}, },
'win10-x64-nvidia': { 'win10-x64-nvidia': {
...@@ -91,8 +91,8 @@ ...@@ -91,8 +91,8 @@
'win10_nvidia_quadro_p400_stable', 'win10_nvidia_quadro_p400_stable',
], ],
'test_suites': { 'test_suites': {
# 'gtest_tests': 'win10_nvidia_gtests', 'gtest_tests': 'win10_nvidia_gtests',
# 'isolated_scripts': 'common_isolated_scripts', 'isolated_scripts': 'common_isolated_scripts',
}, },
}, },
'win7-x64-nvidia': { 'win7-x64-nvidia': {
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
'win7_nvidia_quadro_p400', 'win7_nvidia_quadro_p400',
], ],
'test_suites': { 'test_suites': {
# 'gtest_tests': 'win7_nvidia_gtests', 'gtest_tests': 'win7_nvidia_gtests',
}, },
}, },
'win7-x86-amd': { 'win7-x86-amd': {
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
'win7_amd_r7_240', 'win7_amd_r7_240',
], ],
'test_suites': { 'test_suites': {
# 'gtest_tests': 'win7_amd_gtests', 'gtest_tests': 'win7_amd_gtests',
}, },
}, },
}, },
......
scripts/code_generation_hashes/Test_spec_JSON.json
{ {
"infra/specs/angle.json": "infra/specs/angle.json":
"8b5288bc8c816e1012522e07e855e098", "0726b06598519056f8a5c8734f0ece69",
"infra/specs/generate_test_spec_json.py": "infra/specs/generate_test_spec_json.py":
"e1c8a771f751adad715d7bea900fc8e1", "e1c8a771f751adad715d7bea900fc8e1",
"infra/specs/mixins.pyl": "infra/specs/mixins.pyl":
"ddea2e586fd1b491a17dcc397e1a7aeb", "9e823fc9ff27db9fc49eae7ac1615ab6",
"infra/specs/test_suite_exceptions.pyl": "infra/specs/test_suite_exceptions.pyl":
"aad1a4aed801277cc531733deab221b5", "aad1a4aed801277cc531733deab221b5",
"infra/specs/test_suites.pyl": "infra/specs/test_suites.pyl":
"4646f3a532bca617ad193369ccac9537", "70132906d90e248ca8f11bc3249e7956",
"infra/specs/variants.pyl": "infra/specs/variants.pyl":
"8cfcaa99fa07ad2a2d5d14f220fd5037", "8cfcaa99fa07ad2a2d5d14f220fd5037",
"infra/specs/waterfalls.pyl": "infra/specs/waterfalls.pyl":
"b055856f6013c8afdb382e2faa7fc702", "47c2f121c522b88f0c973803bff72ed8",
"testing/buildbot/generate_buildbot_json.py": "testing/buildbot/generate_buildbot_json.py":
"c04d166b1cee26a4db52c1b1613c8462", "c04d166b1cee26a4db52c1b1613c8462",
"testing/buildbot/mixins.pyl": "testing/buildbot/mixins.pyl":
......
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