Remove the presubmit progressive roll-out logic in `regen-test-files`.
ART run-tests (that are supported at build- and run-time) have been
used in `presubmit` and `mainline-presubmit` test groups in
`TEST_MAPPING` respectively since March 2021
(https://android-review.googlesource.com/c/platform/art/+/1619103) and
May 2021
(https://android-review.googlesource.com/c/platform/art/+/1714240).
As these tests have been reasonably stable since, remove the
progressive roll-out logic (used to promote run-tests from postsubmits
to presubmits) from script `test/utils/regen-test-files`.
Test: Run `art/test/utils/regen-test-files` and check there is no
difference in generated files
Bug: 152374989
Bug: 169310621
Bug: 178703264
Change-Id: I8676bbe5e12bdc81feaff712a42d22e848293833
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index 7ccc496..7e5f0ae 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -380,17 +380,6 @@
"997-single-step",
])
-# Percentage of ART run-tests (among the ones expected to succeed) to include in
-# the `presubmit` test group in `TEST_MAPPING` file -- the rest will be included
-# in `postsubmit` test group.
-# This value has to be a number between 0 and 100.
-presubmit_tests_percentage = 100
-
-# Percentage of ART run-tests (among the ones expected to succeed) to include in
-# the `mainline-presubmit` test group in `TEST_MAPPING` file.
-# This value has to be a number between 0 and 100.
-mainline_presubmit_tests_percentage = 100
-
# ART gtests that do not need root access to the device.
art_gtest_user_module_names = [
"art_standalone_cmdline_tests",
@@ -627,8 +616,7 @@
}}
"""))
- def regen_test_mapping_file(self, art_run_tests, num_presubmit_run_tests,
- num_mainline_presubmit_run_tests):
+ def regen_test_mapping_file(self, art_run_tests):
"""Regenerate ART's `TEST_MAPPING`."""
run_test_module_names = [ART_RUN_TEST_MODULE_NAME_PREFIX + t for t in art_run_tests]
@@ -637,8 +625,7 @@
mainline_other_presubmit_tests = [
"ComposHostTestCases",
]
- mainline_presubmit_run_tests = run_test_module_names[0:num_mainline_presubmit_run_tests]
- mainline_presubmit_tests = (mainline_other_presubmit_tests + mainline_presubmit_run_tests +
+ mainline_presubmit_tests = (mainline_other_presubmit_tests + run_test_module_names +
art_gtests_mainline_presubmit_module_names)
mainline_presubmit_tests_with_apex = [t + "[com.google.android.art.apex]"
for t
@@ -652,14 +639,9 @@
"ArtServiceTests",
"ComposHostTestCases",
]
- presubmit_run_tests = run_test_module_names[0:num_presubmit_run_tests]
- presubmit_tests = other_presubmit_tests + presubmit_run_tests + art_gtest_module_names
+ presubmit_tests = other_presubmit_tests + run_test_module_names + art_gtest_module_names
presubmit_tests_dict = [{"name": t} for t in presubmit_tests]
- # Postsubmits.
- postsubmit_run_tests = run_test_module_names[num_presubmit_run_tests:]
- postsubmit_tests_dict = [{"name": t} for t in postsubmit_run_tests]
-
# Use an `OrderedDict` container to preserve the order in which items are inserted.
# Do not produce an entry for a test group if it is empty.
test_mapping_dict = collections.OrderedDict([
@@ -668,7 +650,6 @@
in [
("mainline-presubmit", mainline_presubmit_tests_dict),
("presubmit", presubmit_tests_dict),
- ("postsubmit", postsubmit_tests_dict),
]
if test_group_dict
])
@@ -921,20 +902,10 @@
# Note: We only include ART run-tests expected to succeed for now.
- # Note: We only include a (growing) fraction of the supported ART
- # run-tests (see `presubmit_tests_percentage`) into the
- # `presubmit` test group (the other ART run-tests are added to the
- # `postsubmit` test group), as we initially had issues with
- # Android presubmits when the whole set of supported ART run-tests
- # was included in one go (b/169310621). This progressive rollout
- # allows us to better monitor future potential presubmit failures.
- #
- # Likewise for tests in the `mainline-presubmit` group.
- num_presubmit_run_tests = int(len(expected_succeeding_tests) * presubmit_tests_percentage / 100)
- num_mainline_presubmit_run_tests = int(
- len(expected_succeeding_tests) * mainline_presubmit_tests_percentage / 100)
- self.regen_test_mapping_file(
- expected_succeeding_tests, num_presubmit_run_tests, num_mainline_presubmit_run_tests)
+ num_presubmit_run_tests = len(expected_succeeding_tests)
+ num_mainline_presubmit_run_tests = len(expected_succeeding_tests)
+
+ self.regen_test_mapping_file(expected_succeeding_tests)
expected_succeeding_tests_percentage = int(
len(expected_succeeding_tests) * 100 / len(run_tests))
@@ -942,19 +913,14 @@
mainline_presubmit_gtests_percentage = int(
len(art_gtests_mainline_presubmit_module_names) * 100 / len(art_gtest_module_names))
- num_postsubmit_tests = len(expected_succeeding_tests) - num_presubmit_run_tests
- postsubmit_tests_percentage = 100 - presubmit_tests_percentage
-
print(f"Generated TEST_MAPPING entries for {len(expected_succeeding_tests)} ART run-tests out"
f" of {len(run_tests)} ({expected_succeeding_tests_percentage}%):")
for (num_tests, test_kind, tests_percentage, test_group_name) in [
- (num_mainline_presubmit_run_tests, "ART run-tests", mainline_presubmit_tests_percentage,
- "mainline-presubmit"),
+ (num_mainline_presubmit_run_tests, "ART run-tests", 100, "mainline-presubmit"),
(len(art_gtests_mainline_presubmit_module_names), "ART gtests",
mainline_presubmit_gtests_percentage, "mainline-presubmit"),
- (num_presubmit_run_tests, "ART run-tests", presubmit_tests_percentage, "presubmit"),
+ (num_presubmit_run_tests, "ART run-tests", 100, "presubmit"),
(len(art_gtest_module_names), "ART gtests", 100, "presubmit"),
- (num_postsubmit_tests, "ART run-tests", postsubmit_tests_percentage, "postsubmit"),
]:
print(
f" {num_tests:3d} {test_kind} ({tests_percentage}%) in `{test_group_name}` test group.")