Skip to content

GitLab

T
tangled
Commit 7d98a778 authored by Yoshisato Yanagisawa's avatar Yoshisato Yanagisawa Committed by Chromium LUCI CQ
Browse files
Options

Make Goma RBE builders have equivalent tests with non-Goma RBE. 

Bug: b/168080931
Bug: b/147265909
Change-Id: I6cdcd2fb6a5813b453ef809011d6c09d9ee169a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2637302Reviewed-by: default avatarFumitoshi Ukai <ukai@google.com>
Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Auto-Submit: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844709}
parent 41da0926
Hide whitespace changes
Inline Side-by-side
Showing with 408 additions and 0 deletions
testing/buildbot/chromium.goma.fyi.json
View file @ 7d98a778
...@@ -124,6 +124,88 @@ ...@@ -124,6 +124,88 @@
} }
] ]
}, },
"Mac Builder (dbg) Goma RBE Canary (clobber)": {
"additional_compile_targets": [
"all"
],
"gtest_tests": [
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "content_unittests",
"test_id_prefix": "ninja://content/test:content_unittests/"
}
]
},
"Mac Builder (dbg) Goma RBE Latest Client (clobber)": {
"additional_compile_targets": [
"all"
],
"gtest_tests": [
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "content_unittests",
"test_id_prefix": "ninja://content/test:content_unittests/"
}
]
},
"Mac Builder Goma Canary": { "Mac Builder Goma Canary": {
"additional_compile_targets": [ "additional_compile_targets": [
"all", "all",
...@@ -382,6 +464,170 @@ ...@@ -382,6 +464,170 @@
} }
] ]
}, },
"linux-archive-rel-goma-rbe-ats-canary": {
"additional_compile_targets": [
"all"
],
"gtest_tests": [
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "content_unittests",
"test_id_prefix": "ninja://content/test:content_unittests/"
}
]
},
"linux-archive-rel-goma-rbe-ats-latest": {
"additional_compile_targets": [
"all"
],
"gtest_tests": [
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "content_unittests",
"test_id_prefix": "ninja://content/test:content_unittests/"
}
]
},
"linux-archive-rel-goma-rbe-canary": {
"additional_compile_targets": [
"all"
],
"gtest_tests": [
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "content_unittests",
"test_id_prefix": "ninja://content/test:content_unittests/"
}
]
},
"linux-archive-rel-goma-rbe-latest": {
"additional_compile_targets": [
"all"
],
"gtest_tests": [
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "content_unittests",
"test_id_prefix": "ninja://content/test:content_unittests/"
}
]
},
"mac-archive-rel-goma-canary": { "mac-archive-rel-goma-canary": {
"additional_compile_targets": [ "additional_compile_targets": [
"chrome" "chrome"
...@@ -469,6 +715,88 @@ ...@@ -469,6 +715,88 @@
"chrome" "chrome"
] ]
}, },
"mac-archive-rel-goma-rbe-canary": {
"additional_compile_targets": [
"chrome"
],
"gtest_tests": [
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "content_unittests",
"test_id_prefix": "ninja://content/test:content_unittests/"
}
]
},
"mac-archive-rel-goma-rbe-latest": {
"additional_compile_targets": [
"chrome"
],
"gtest_tests": [
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Mac"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "content_unittests",
"test_id_prefix": "ninja://content/test:content_unittests/"
}
]
},
"win32-archive-rel-goma-canary-localoutputcache": { "win32-archive-rel-goma-canary-localoutputcache": {
"additional_compile_targets": [ "additional_compile_targets": [
"all" "all"
......
testing/buildbot/waterfalls.pyl
View file @ 7d98a778
...@@ -3430,6 +3430,22 @@ ...@@ -3430,6 +3430,22 @@
'gtest_tests': 'goma_mac_gtests', 'gtest_tests': 'goma_mac_gtests',
}, },
}, },
'Mac Builder (dbg) Goma RBE Canary (clobber)': {
'additional_compile_targets': [
'all',
],
'test_suites': {
'gtest_tests': 'goma_mac_gtests',
},
},
'Mac Builder (dbg) Goma RBE Latest Client (clobber)': {
'additional_compile_targets': [
'all',
],
'test_suites': {
'gtest_tests': 'goma_mac_gtests',
},
},
'Mac Builder Goma Canary': { 'Mac Builder Goma Canary': {
'additional_compile_targets': [ 'additional_compile_targets': [
'all', 'all',
...@@ -3553,6 +3569,50 @@ ...@@ -3553,6 +3569,50 @@
'gtest_tests': 'goma_gtests', 'gtest_tests': 'goma_gtests',
}, },
}, },
'linux-archive-rel-goma-rbe-ats-canary': {
'additional_compile_targets': [
'all',
],
'mixins': [
'linux-xenial',
],
'test_suites': {
'gtest_tests': 'goma_gtests',
},
},
'linux-archive-rel-goma-rbe-ats-latest': {
'additional_compile_targets': [
'all',
],
'mixins': [
'linux-xenial',
],
'test_suites': {
'gtest_tests': 'goma_gtests',
},
},
'linux-archive-rel-goma-rbe-canary': {
'additional_compile_targets': [
'all',
],
'mixins': [
'linux-xenial',
],
'test_suites': {
'gtest_tests': 'goma_gtests',
},
},
'linux-archive-rel-goma-rbe-latest': {
'additional_compile_targets': [
'all',
],
'mixins': [
'linux-xenial',
],
'test_suites': {
'gtest_tests': 'goma_gtests',
},
},
'mac-archive-rel-goma-canary': { 'mac-archive-rel-goma-canary': {
'additional_compile_targets': [ 'additional_compile_targets': [
# Due to disk shortage, we build 'chrome' instead of 'all'. # Due to disk shortage, we build 'chrome' instead of 'all'.
...@@ -3578,6 +3638,26 @@ ...@@ -3578,6 +3638,26 @@
'chrome', 'chrome',
], ],
}, },
'mac-archive-rel-goma-rbe-canary': {
'additional_compile_targets': [
# Due to disk shortage, we build 'chrome' instead of 'all'.
# See crbug.com/899425
'chrome',
],
'test_suites': {
'gtest_tests': 'goma_mac_gtests',
},
},
'mac-archive-rel-goma-rbe-latest': {
'additional_compile_targets': [
# Due to disk shortage, we build 'chrome' instead of 'all'.
# See crbug.com/899425
'chrome',
],
'test_suites': {
'gtest_tests': 'goma_mac_gtests',
},
},
'win32-archive-rel-goma-canary-localoutputcache': { 'win32-archive-rel-goma-canary-localoutputcache': {
'additional_compile_targets': [ 'additional_compile_targets': [
'all', 'all',
......
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