Revert "Add a test-list test for the Linux ChromeOS bots to run PPPAI"
This reverts commit 7fb0b7889c451daf8035ada2a23801a379130a62.
Reason for revert: Step('archive results for ppapi_blink_web_tests') failing on go/linux-chromeos-chrome since https://ci.chromium.org/ui/p/chrome/builders/ci/linux-chromeos-chrome/37321/blamelist
Bug: b:312519683
Original change's description:
> Add a test-list test for the Linux ChromeOS bots to run PPPAI
>
> Run the PPAPI tests as a separate build step on the linux chromeos
> bots.
>
> Bug: b:303417958
> Change-Id: I666cea84137dbd043f229daea69b9f81db69e734
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5041091
> Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Reviewed-by: Ben Pastene <bpastene@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1227483}
Bug: b:303417958
Change-Id: I9615f74618ec5eed6f7760e5f5ad2bfca659be96
Cq-Include-Trybots: luci.chrome.try:linux-chromeos-chrome
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5051580
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Trent Apted <tapted@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Trent Apted <tapted@chromium.org>
Owners-Override: Trent Apted <tapted@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1227677}
diff --git a/BUILD.gn b/BUILD.gn
index 6d83121..7ee617b 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1227,7 +1227,7 @@
]
}
- if (is_linux || is_chromeos || is_fuchsia) {
+ if (is_linux || is_fuchsia) {
data += [ "//third_party/apache-linux/" ]
}
diff --git a/infra/config/generated/testing/test_suites.pyl b/infra/config/generated/testing/test_suites.pyl
index 7e4a61a..a326b10d 100644
--- a/infra/config/generated/testing/test_suites.pyl
+++ b/infra/config/generated/testing/test_suites.pyl
@@ -294,27 +294,6 @@
},
},
- 'blink_web_tests_ppapi_isolated_scripts': {
- 'ppapi_blink_web_tests': {
- 'test': 'blink_web_tests',
- 'results_handler': 'layout tests',
- 'mixins': [
- 'has_native_resultdb_integration',
- 'blink_tests_write_run_histories',
- ],
- 'args': [
- '--num-retries=3',
- '--test-list=../../third_party/blink/web_tests/TestLists/ppapi',
- ],
- 'merge': {
- 'script': '//third_party/blink/tools/merge_web_test_results.py',
- 'args': [
- '--verbose',
- ],
- },
- },
- },
-
'cast_audio_specific_chromium_gtests': {
'cast_audio_backend_unittests': {},
'cast_base_unittests': {},
@@ -6562,11 +6541,6 @@
'non_android_chromium_gtests',
],
- 'linux_chromeos_isolated_scripts': [
- 'blink_web_tests_ppapi_isolated_scripts',
- 'chrome_sizes',
- ],
-
'linux_chromeos_specific_and_lacros_dependent_gtests': [
'aura_gtests',
'chromium_gtests',
diff --git a/infra/config/targets/basic_suites.star b/infra/config/targets/basic_suites.star
index d5cd800..d686e500 100644
--- a/infra/config/targets/basic_suites.star
+++ b/infra/config/targets/basic_suites.star
@@ -370,33 +370,6 @@
)
targets.legacy_basic_suite(
- name = "blink_web_tests_ppapi_isolated_scripts",
- tests = {
- "ppapi_blink_web_tests": targets.legacy_test_config(
- test = "blink_web_tests",
- results_handler = "layout tests",
- mixins = [
- "has_native_resultdb_integration",
- "blink_tests_write_run_histories",
- ],
- args = [
- # layout test failures are retried 3 times when '--test-list' is not
- # passed, but 0 times when '--test-list' is passed. We want to always
- # retry 3 times, so we explicitly specify it.
- "--num-retries=3",
- "--test-list=../../third_party/blink/web_tests/TestLists/ppapi",
- ],
- merge = targets.merge(
- script = "//third_party/blink/tools/merge_web_test_results.py",
- args = [
- "--verbose",
- ],
- ),
- ),
- },
-)
-
-targets.legacy_basic_suite(
name = "cast_audio_specific_chromium_gtests",
tests = {
"cast_audio_backend_unittests": None,
diff --git a/infra/config/targets/compound_suites.star b/infra/config/targets/compound_suites.star
index 34cdaa9..9bede8a 100644
--- a/infra/config/targets/compound_suites.star
+++ b/infra/config/targets/compound_suites.star
@@ -1279,14 +1279,6 @@
],
)
-targets.legacy_compound_suite(
- name = "linux_chromeos_isolated_scripts",
- basic_suites = [
- "blink_web_tests_ppapi_isolated_scripts",
- "chrome_sizes",
- ],
-)
-
# This is:
# linux_chromeos_gtests
# + 'linux_chromeos_browser_tests_require_lacros'
diff --git a/testing/buildbot/chrome.json b/testing/buildbot/chrome.json
index c4ccda70..9943cc4 100644
--- a/testing/buildbot/chrome.json
+++ b/testing/buildbot/chrome.json
@@ -3889,35 +3889,6 @@
},
"test": "chrome_sizes",
"test_id_prefix": "ninja://chrome/test:chrome_sizes/"
- },
- {
- "args": [
- "--num-retries=3",
- "--test-list=../../third_party/blink/web_tests/TestLists/ppapi",
- "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json"
- ],
- "merge": {
- "args": [
- "--verbose"
- ],
- "script": "//third_party/blink/tools/merge_web_test_results.py"
- },
- "name": "ppapi_blink_web_tests",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "results_handler": "layout tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04",
- "pool": "chrome.tests",
- "ssd": "0"
- },
- "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "blink_web_tests",
- "test_id_prefix": "ninja://:blink_web_tests/"
}
]
},
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index 5b8f4b7..2f80a08 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -3928,53 +3928,6 @@
"test": "zlib_unittests",
"test_id_prefix": "ninja://third_party/zlib:zlib_unittests/"
}
- ],
- "isolated_scripts": [
- {
- "merge": {
- "script": "//tools/perf/process_perf_results.py"
- },
- "name": "chrome_sizes",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "chrome_sizes",
- "test_id_prefix": "ninja://chrome/test:chrome_sizes/"
- },
- {
- "args": [
- "--num-retries=3",
- "--test-list=../../third_party/blink/web_tests/TestLists/ppapi",
- "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json"
- ],
- "merge": {
- "args": [
- "--verbose"
- ],
- "script": "//third_party/blink/tools/merge_web_test_results.py"
- },
- "name": "ppapi_blink_web_tests",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "results_handler": "layout tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "blink_web_tests",
- "test_id_prefix": "ninja://:blink_web_tests/"
- }
]
},
"linux-chromeos-rel": {
@@ -5472,55 +5425,6 @@
"test_id_prefix": "ninja://third_party/zlib:zlib_unittests/"
}
],
- "isolated_scripts": [
- {
- "isolate_profile_data": true,
- "merge": {
- "script": "//tools/perf/process_perf_results.py"
- },
- "name": "chrome_sizes",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "chrome_sizes",
- "test_id_prefix": "ninja://chrome/test:chrome_sizes/"
- },
- {
- "args": [
- "--num-retries=3",
- "--test-list=../../third_party/blink/web_tests/TestLists/ppapi",
- "--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json"
- ],
- "isolate_profile_data": true,
- "merge": {
- "args": [
- "--verbose"
- ],
- "script": "//third_party/blink/tools/merge_web_test_results.py"
- },
- "name": "ppapi_blink_web_tests",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "results_handler": "layout tests",
- "swarming": {
- "dimensions": {
- "os": "Ubuntu-22.04"
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "blink_web_tests",
- "test_id_prefix": "ninja://:blink_web_tests/"
- }
- ],
"scripts": [
{
"isolate_profile_data": true,
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index 7e4a61a..a326b10d 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -294,27 +294,6 @@
},
},
- 'blink_web_tests_ppapi_isolated_scripts': {
- 'ppapi_blink_web_tests': {
- 'test': 'blink_web_tests',
- 'results_handler': 'layout tests',
- 'mixins': [
- 'has_native_resultdb_integration',
- 'blink_tests_write_run_histories',
- ],
- 'args': [
- '--num-retries=3',
- '--test-list=../../third_party/blink/web_tests/TestLists/ppapi',
- ],
- 'merge': {
- 'script': '//third_party/blink/tools/merge_web_test_results.py',
- 'args': [
- '--verbose',
- ],
- },
- },
- },
-
'cast_audio_specific_chromium_gtests': {
'cast_audio_backend_unittests': {},
'cast_base_unittests': {},
@@ -6562,11 +6541,6 @@
'non_android_chromium_gtests',
],
- 'linux_chromeos_isolated_scripts': [
- 'blink_web_tests_ppapi_isolated_scripts',
- 'chrome_sizes',
- ],
-
'linux_chromeos_specific_and_lacros_dependent_gtests': [
'aura_gtests',
'chromium_gtests',
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 649322c..cfa72ac 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -260,7 +260,7 @@
},
'test_suites': {
'gtest_tests': 'linux_chromeos_gtests',
- 'isolated_scripts': 'linux_chromeos_isolated_scripts',
+ 'isolated_scripts': 'chrome_sizes',
},
},
'mac-chrome': {
@@ -1682,7 +1682,6 @@
],
'test_suites': {
'gtest_tests': 'linux_chromeos_gtests',
- 'isolated_scripts': 'linux_chromeos_isolated_scripts',
},
},
'linux-chromeos-rel': {
@@ -1695,7 +1694,6 @@
],
'test_suites': {
'gtest_tests': 'linux_chromeos_specific_and_lacros_dependent_gtests',
- 'isolated_scripts': 'linux_chromeos_isolated_scripts',
'scripts': 'chromeos_annotation_scripts',
},
},