Commit b225081b authored by John Budorick's avatar John Budorick Committed by Commit Bot

Add compile, test, and luci configs for mac-mojo-rel.

Bug: 878082
Change-Id: I4172f46931e09c5ba8bf85f0113e5f31df53e9c5
Reviewed-on: https://chromium-review.googlesource.com/c/1279409Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599808}
parent 2bae692f
...@@ -1301,6 +1301,12 @@ buckets { ...@@ -1301,6 +1301,12 @@ buckets {
mixins: "mac-ci" mixins: "mac-ci"
dimensions: "cores:4" dimensions: "cores:4"
} }
builders {
name: "mac-mojo-rel"
mixins: "mac"
mixins: "fyi-ci"
dimensions: "cores:4"
}
builders { builders {
name: "Mac Builder" name: "Mac Builder"
......
...@@ -2686,6 +2686,11 @@ consoles { ...@@ -2686,6 +2686,11 @@ consoles {
category: "mojo" category: "mojo"
short_name: "lnx" short_name: "lnx"
} }
builders {
name: "buildbucket/luci.chromium.ci/mac-mojo-rel"
category: "mojo"
short_name: "mac"
}
builders { builders {
name: "buildbucket/luci.chromium.ci/Mojo Windows" name: "buildbucket/luci.chromium.ci/Mojo Windows"
category: "mojo" category: "mojo"
......
...@@ -319,6 +319,7 @@ trigger { ...@@ -319,6 +319,7 @@ trigger {
triggers: "mac-code-coverage-generation" triggers: "mac-code-coverage-generation"
triggers: "mac-dbg" triggers: "mac-dbg"
triggers: "mac-jumbo-rel" triggers: "mac-jumbo-rel"
triggers: "mac-mojo-rel"
triggers: "mac-rel" triggers: "mac-rel"
triggers: "mac-views-rel" triggers: "mac-views-rel"
triggers: "win-annotator-rel" triggers: "win-annotator-rel"
...@@ -1785,6 +1786,16 @@ job { ...@@ -1785,6 +1786,16 @@ job {
} }
} }
job {
id: "mac-mojo-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "mac-mojo-rel"
}
}
job { job {
id: "Mac Debug (Intel)" id: "Mac Debug (Intel)"
# Triggered by "GPU Mac Builder (dbg)". # Triggered by "GPU Mac Builder (dbg)".
......
...@@ -6462,6 +6462,122 @@ ...@@ -6462,6 +6462,122 @@
} }
] ]
}, },
"mac-mojo-rel": {
"gtest_tests": [
{
"args": [
"--enable-features=NetworkService",
"--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_browser_tests.filter"
],
"name": "network_service_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.13"
}
],
"shards": 15
},
"test": "browser_tests"
},
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_components_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.13"
}
]
},
"test": "components_browsertests"
},
{
"args": [
"--enable-features=NetworkService",
"--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter"
],
"name": "network_service_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.13"
}
],
"shards": 2
},
"test": "content_browsertests"
},
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_extensions_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.13"
}
]
},
"test": "extensions_browsertests"
},
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.13"
}
],
"shards": 3
},
"test": "interactive_ui_tests"
}
],
"isolated_scripts": [
{
"args": [
"--additional-driver-flag=--enable-features=NetworkService",
"--num-retries=3"
],
"isolate_name": "webkit_layout_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webkit_layout_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.13"
}
],
"shards": 12
}
}
]
},
"mac-osxbeta-rel": { "mac-osxbeta-rel": {
"gtest_tests": [ "gtest_tests": [
{ {
......
...@@ -1383,6 +1383,16 @@ ...@@ -1383,6 +1383,16 @@
'scripts': 'chromium_linux_scripts', 'scripts': 'chromium_linux_scripts',
}, },
}, },
'mac-mojo-rel': {
'mixins': [
'mac_10.13',
'no_gpu',
],
'test_suites': {
'gtest_tests': 'network_service_gtests',
'isolated_scripts': 'mojo_network_isolated_scripts',
},
},
'mac-osxbeta-rel': { 'mac-osxbeta-rel': {
'mixins': [ 'mixins': [
'intel_iris_5100', 'intel_iris_5100',
......
...@@ -237,6 +237,7 @@ ...@@ -237,6 +237,7 @@
'Mojo ChromiumOS': 'chromeos_with_codecs_release_trybot', 'Mojo ChromiumOS': 'chromeos_with_codecs_release_trybot',
'Mojo Android': 'android_release_bot_minimal_symbols_arm64', 'Mojo Android': 'android_release_bot_minimal_symbols_arm64',
'Mojo Linux': 'release_trybot', 'Mojo Linux': 'release_trybot',
'mac-mojo-rel': 'release_trybot',
'Mojo Windows': 'release_bot_x86_minimal_symbols', 'Mojo Windows': 'release_bot_x86_minimal_symbols',
'Site Isolation Android': 'android_release_bot_minimal_symbols_arm64', 'Site Isolation Android': 'android_release_bot_minimal_symbols_arm64',
......
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