Convert chromium.goma to generate_buildbot_json.
R=kbr@chromium.org, jbudorick@chromium.org
BUG=662541
Change-Id: I152e12b9b8d92a7fef53557b44cae22ac8b092e6
Reviewed-on: https://chromium-review.googlesource.com/818399
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523010}diff --git a/testing/buildbot/chromium.goma.json b/testing/buildbot/chromium.goma.json
index d8c94d2d..f5b960b 100644
--- a/testing/buildbot/chromium.goma.json
+++ b/testing/buildbot/chromium.goma.json
@@ -1,4 +1,6 @@
{
+ "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
+ "AAAAA2 See generate_buildbot_json.py to make changes": {},
"Chromium Linux Goma GCE Staging": {
"additional_compile_targets": [
"all"
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index 2c858ab9..12879a0 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -481,6 +481,11 @@
'sql_unittests': {},
},
+ 'goma_gtests': {
+ 'base_unittests': {},
+ 'content_unittests': {},
+ },
+
'linux_and_android_specific_chromium_gtests': {
'renderer_side_navigation_content_browsertests': {
'args': [
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index fcf7de9e..1b25a6a 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -638,6 +638,75 @@
},
},
{
+ 'name': 'chromium.goma',
+ 'machines': {
+ 'Chromium Linux Goma GCE Staging': {
+ 'additional_compile_targets': [
+ 'all',
+ ],
+ 'test_suites': {
+ 'gtest_tests': 'goma_gtests',
+ },
+ },
+ 'Chromium Linux Goma Staging': {
+ 'additional_compile_targets': [
+ 'all',
+ ],
+ 'test_suites': {
+ 'gtest_tests': 'goma_gtests',
+ },
+ },
+ 'Chromium Mac Goma GCE Staging': {
+ 'additional_compile_targets': [
+ 'all',
+ ],
+ 'test_suites': {
+ 'gtest_tests': 'goma_gtests',
+ },
+ },
+ 'Chromium Mac Goma Staging': {
+ 'additional_compile_targets': [
+ 'all',
+ ],
+ 'test_suites': {
+ 'gtest_tests': 'goma_gtests',
+ },
+ },
+ 'CrWinClangGomaGCEStaging': {
+ 'additional_compile_targets': [
+ 'all',
+ ],
+ 'test_suites': {
+ 'gtest_tests': 'goma_gtests',
+ },
+ },
+ 'CrWinClexeGomaGCEStaging': {
+ 'additional_compile_targets': [
+ 'all',
+ ],
+ 'test_suites': {
+ 'gtest_tests': 'goma_gtests',
+ },
+ },
+ 'CrWinGomaGCEStaging': {
+ 'additional_compile_targets': [
+ 'all',
+ ],
+ 'test_suites': {
+ 'gtest_tests': 'goma_gtests',
+ },
+ },
+ 'CrWinGomaStaging': {
+ 'additional_compile_targets': [
+ 'all',
+ ],
+ 'test_suites': {
+ 'gtest_tests': 'goma_gtests',
+ },
+ },
+ },
+ },
+ {
'name': 'chromium.linux',
'machines': {
'Fuchsia ARM64': {
