Revert "Custom builder for EA SWA"
This reverts commit 1bac67ba6a110d806b01b40f97795aa70b21c241.
Reason for revert: Deprecating custom builder linux-chromeos-chrome-easwa
Original change's description:
> Custom builder for EA SWA
>
> For review with:
> https://chrome-internal-review.googlesource.com/c/chrome/src-internal/+/3268904
>
> Bug: b:156979639, chromium:1094203
> Change-Id: I569ea223107ac93a235fa7fe9fa25adb6656a444
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2407999
> Reviewed-by: Stephen Martinis <martiniss@chromium.org>
> Auto-Submit: Jose Magana <jomag@chromium.org>
> Commit-Queue: Jose Magana <jomag@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#806872}
Bug: b:156979639
Bug: chromium:1094203
Change-Id: Ic2af2b1862c2ac4b88732fa07912195d1a679cc3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2503989
Commit-Queue: Jose Magana <jomag@chromium.org>
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821547}
diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg
index 9a3f774..3b274a7 100644
--- a/infra/config/generated/commit-queue.cfg
+++ b/infra/config/generated/commit-queue.cfg
@@ -108,12 +108,6 @@
owner_whitelist_group: "project-chromium-robot-committers"
}
builders {
- name: "chrome/try/linux-chromeos-chrome-easwa"
- includable_only: true
- owner_whitelist_group: "googlers"
- owner_whitelist_group: "project-chromium-robot-committers"
- }
- builders {
name: "chrome/try/mac-chrome"
includable_only: true
owner_whitelist_group: "googlers"
diff --git a/infra/config/subprojects/chromium/try.star b/infra/config/subprojects/chromium/try.star
index de4b561..2fc15f7 100644
--- a/infra/config/subprojects/chromium/try.star
+++ b/infra/config/subprojects/chromium/try.star
@@ -1689,10 +1689,6 @@
)
chrome_internal_verifier(
- builder = "linux-chromeos-chrome-easwa",
-)
-
-chrome_internal_verifier(
builder = "mac-chrome",
)
diff --git a/testing/buildbot/chrome.json b/testing/buildbot/chrome.json
index fd8da9f8..8bd03b3 100644
--- a/testing/buildbot/chrome.json
+++ b/testing/buildbot/chrome.json
@@ -6647,39 +6647,6 @@
}
]
},
- "linux-chromeos-chrome-easwa": {
- "additional_compile_targets": [
- "chrome",
- "chrome_sandbox",
- "linux_symbols",
- "symupload"
- ],
- "gtest_tests": [
- {
- "args": [
- "--gtest_filter=*HelpApp*:*MediaApp*"
- ],
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "name": "easwa_browser_tests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "os": "Ubuntu-16.04",
- "pool": "chrome.tests",
- "ssd": "0"
- }
- ],
- "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "browser_tests",
- "test_id_prefix": "ninja://chrome/test:browser_tests/"
- }
- ]
- },
"mac-chrome": {
"additional_compile_targets": [
"chrome"
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index fe5c2ff..0b6c8fc1 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -1310,18 +1310,6 @@
},
},
- 'easwa_browser_tests' : {
- 'easwa_browser_tests': {
- 'args': [
- '--gtest_filter=*HelpApp*:*MediaApp*'
- ],
- 'swarming': {
- 'shards': 1,
- },
- 'test': 'browser_tests',
- }
- },
-
'fieldtrial_browser_tests': {
'no_fieldtrial_browser_tests': {
'args': [
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 8da1923..fc5892b 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -356,28 +356,6 @@
'isolated_scripts': 'chrome_sizes',
},
},
- 'linux-chromeos-chrome-easwa': {
- 'additional_compile_targets': [
- 'chrome',
- 'chrome_sandbox',
- 'linux_symbols',
- 'symupload'
- ],
- 'mixins': [
- 'chrome-swarming-pool',
- 'linux-xenial',
- ],
- 'swarming': {
- 'dimension_sets': [
- {
- 'ssd': '0',
- },
- ],
- },
- 'test_suites': {
- 'gtest_tests': 'easwa_browser_tests',
- },
- },
'mac-chrome': {
'additional_compile_targets': [
'chrome',
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index b727d55..1c98576 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -38,7 +38,6 @@
'linux-chrome-beta': 'official_goma',
'linux-chrome-stable': 'official_goma',
'linux-chromeos-chrome': 'official_goma_chromeos_include_unwind_tables',
- 'linux-chromeos-chrome-easwa': 'official_goma_chromeos',
'mac-chrome': 'official_goma_mac',
'mac-chrome-beta': 'official_goma_mac',
'mac-chrome-stable': 'official_goma_mac',
@@ -847,7 +846,6 @@
'linux-chrome-beta': 'official_goma',
'linux-chrome-stable': 'official_goma',
'linux-chromeos-chrome': 'official_goma_chromeos_include_unwind_tables',
- 'linux-chromeos-chrome-easwa': 'official_goma_chromeos_include_unwind_tables',
'mac-chrome': 'official_goma_mac',
'mac-chrome-beta': 'official_goma_mac',
'mac-chrome-stable': 'official_goma_mac',
@@ -2224,10 +2222,6 @@
'official', 'goma', 'static', 'no_symbols', 'pgo_phase_1',
],
- 'official_goma_chromeos': [
- 'official', 'goma', 'chromeos',
- ],
-
'official_goma_chromeos_include_unwind_tables': [
'official', 'goma', 'chromeos', 'include_unwind_tables',
],
diff --git a/tools/mb/mb_config_expectations/chrome.json b/tools/mb/mb_config_expectations/chrome.json
index e2ec3796..83a742df 100644
--- a/tools/mb/mb_config_expectations/chrome.json
+++ b/tools/mb/mb_config_expectations/chrome.json
@@ -255,14 +255,6 @@
"use_goma": true
}
},
- "linux-chromeos-chrome-easwa": {
- "gn_args": {
- "is_chrome_branded": true,
- "is_official_build": true,
- "target_os": "chromeos",
- "use_goma": true
- }
- },
"mac-chrome": {
"gn_args": {
"ignore_missing_widevine_signing_cert": true,
diff --git a/tools/mb/mb_config_expectations/tryserver.chrome.json b/tools/mb/mb_config_expectations/tryserver.chrome.json
index b1ebc35..aebae116 100644
--- a/tools/mb/mb_config_expectations/tryserver.chrome.json
+++ b/tools/mb/mb_config_expectations/tryserver.chrome.json
@@ -134,15 +134,6 @@
"use_goma": true
}
},
- "linux-chromeos-chrome-easwa": {
- "gn_args": {
- "exclude_unwind_tables": false,
- "is_chrome_branded": true,
- "is_official_build": true,
- "target_os": "chromeos",
- "use_goma": true
- }
- },
"mac-chrome": {
"gn_args": {
"ignore_missing_widevine_signing_cert": true,