[reclient] Migrate block 5 Win angle builders
Migrate following builders from goma to reclient:
* win-angle-chromium-x86-builder
* win-swangle-tot-angle-x64
* win-swangle-tot-swiftshader-x86
Bug: 1313293, b/228101549
Change-Id: Ia2bd95c8af1860b47d69f373ca5d942ccdb3e1ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3630662
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1001098}
NOKEYCHECK=True
GitOrigin-RevId: 7f78f00fdc5c263cad670ca97945506200d0ad43
diff --git a/mb_config.pyl b/mb_config.pyl
index d539632..9c1ea9e 100644
--- a/mb_config.pyl
+++ b/mb_config.pyl
@@ -145,7 +145,7 @@
'linux-angle-chromium-builder': 'gpu_tests_release_trybot_minimal_symbols_reclient',
'mac-angle-chromium-builder': 'gpu_tests_release_trybot_minimal_symbols',
'win-angle-chromium-x64-builder': 'gpu_tests_release_trybot_minimal_symbols_reclient',
- 'win-angle-chromium-x86-builder': 'gpu_tests_release_bot_dcheck_always_on_x86',
+ 'win-angle-chromium-x86-builder': 'gpu_tests_release_bot_dcheck_always_on_x86_reclient',
'win-angle-x64-builder': 'angle_deqp_release_trybot_reclient',
},
@@ -671,10 +671,10 @@
'linux-swangle-x64': 'angle_deqp_release_trybot_reclient',
'mac-swangle-chromium-x64': 'gpu_tests_release_trybot_minimal_symbols',
'win-swangle-chromium-x86': 'gpu_tests_release_trybot_minimal_symbol_x86_resource_allowlisting_reclient',
- 'win-swangle-tot-angle-x64': 'angle_deqp_release_trybot',
+ 'win-swangle-tot-angle-x64': 'angle_deqp_release_trybot_reclient',
'win-swangle-tot-angle-x86': 'angle_deqp_release_bot_dcheck_always_on_x86_reclient',
'win-swangle-tot-swiftshader-x64': 'angle_deqp_release_trybot_reclient',
- 'win-swangle-tot-swiftshader-x86': 'angle_deqp_release_bot_dcheck_always_on_x86',
+ 'win-swangle-tot-swiftshader-x86': 'angle_deqp_release_bot_dcheck_always_on_x86_reclient',
'win-swangle-x64': 'angle_deqp_release_trybot_reclient',
'win-swangle-x86': 'angle_deqp_release_bot_dcheck_always_on_x86_reclient',
},
@@ -1745,10 +1745,6 @@
'angle_deqp_tests', 'release_trybot_minimal_symbols', 'ios', 'ios_simulator', 'ios_cpu_x64', 'xctest', 'ios_disable_xcode_project_generation',
],
- 'angle_deqp_release_bot_dcheck_always_on_x86': [
- 'angle_deqp_tests', 'shared_release_bot_dcheck_always_on', 'x86',
- ],
-
'angle_deqp_release_bot_dcheck_always_on_x86_reclient': [
'angle_deqp_tests', 'shared_release_bot_dcheck_always_on_reclient', 'x86',
],
@@ -2614,8 +2610,8 @@
'gpu_tests', 'release_trybot_minimal_symbols_reclient', 'resource_allowlisting',
],
- 'gpu_tests_release_bot_dcheck_always_on_x86': [
- 'gpu_tests', 'release_trybot_minimal_symbols', 'x86',
+ 'gpu_tests_release_bot_dcheck_always_on_x86_reclient': [
+ 'gpu_tests', 'release_trybot_minimal_symbols_reclient', 'x86',
],
'gpu_tests_release_bot_do_typecheck_reclient': [
diff --git a/mb_config_expectations/chromium.angle.json b/mb_config_expectations/chromium.angle.json
index 653176d..58bda4a 100644
--- a/mb_config_expectations/chromium.angle.json
+++ b/mb_config_expectations/chromium.angle.json
@@ -110,7 +110,8 @@
"proprietary_codecs": true,
"symbol_level": 1,
"target_cpu": "x86",
- "use_goma": true
+ "use_rbe": true,
+ "use_remoteexec": true
}
},
"win-angle-x64-builder": {
diff --git a/mb_config_expectations/chromium.swangle.json b/mb_config_expectations/chromium.swangle.json
index 1f77f9f..8f3e48a 100644
--- a/mb_config_expectations/chromium.swangle.json
+++ b/mb_config_expectations/chromium.swangle.json
@@ -76,7 +76,8 @@
"is_component_build": true,
"is_debug": false,
"symbol_level": 1,
- "use_goma": true
+ "use_rbe": true,
+ "use_remoteexec": true
}
},
"win-swangle-tot-angle-x86": {
@@ -110,7 +111,8 @@
"is_debug": false,
"symbol_level": 1,
"target_cpu": "x86",
- "use_goma": true
+ "use_rbe": true,
+ "use_remoteexec": true
}
},
"win-swangle-x64": {
