commit 996e374931f7849ca2fef84050f28417da31a200
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Nov 26 01:39:02 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 26 01:39:02 2024 +0000
tree a15ee9c543cca04eedcacd42c7d49a059106a186
parent ccdf1649f2851ead5c6a200dc9e108aac29890a0
parent 05d762d621260346837e7d7945db6e700bc162cd

Merge "Change disable_bazel_mode_by_default feature to deprecate_bazel_mode" into main am: 38a8f50e3b am: 05d762d621

Original change: https://android-review.googlesource.com/c/platform/tools/asuite/+/3372498

Change-Id: Ie2720312639efd4be4f545802efaa557ad9a6347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

atest/arg_parser.py

diff --git a/atest/arg_parser.py b/atest/arg_parser.py
index 05d7720..3250525 100644
--- a/atest/arg_parser.py
+++ b/atest/arg_parser.py
@@ -20,7 +20,6 @@
 
 from atest import bazel_mode
 from atest import constants
-from atest import rollout_control
 from atest.atest_utils import BuildOutputMode
 
 
@@ -120,7 +119,7 @@
   )
   parser.add_argument(
       '--bazel-mode',
-      default=not rollout_control.disable_bazel_mode_by_default.is_enabled(),
+      default=True,
       action='store_true',
       help='Run tests using Bazel (default: True).',
   )

atest/cli_translator.py

diff --git a/atest/cli_translator.py b/atest/cli_translator.py
index 73f6e65..e2bf5f3 100644
--- a/atest/cli_translator.py
+++ b/atest/cli_translator.py
@@ -35,6 +35,7 @@
 from atest import atest_utils
 from atest import bazel_mode
 from atest import constants
+from atest import rollout_control
 from atest import test_finder_handler
 from atest import test_mapping
 from atest.atest_enum import DetectType, ExitCode
@@ -103,7 +104,10 @@
     """
     self.mod_info = mod_info
     self.root_dir = os.getenv(constants.ANDROID_BUILD_TOP, os.sep)
-    self._bazel_mode = bazel_mode_enabled
+    self._bazel_mode = (
+        bazel_mode_enabled
+        and not rollout_control.deprecate_bazel_mode.is_enabled()
+    )
     self._bazel_mode_features = bazel_mode_features or []
     self._host = host
     self.enable_file_patterns = False

atest/rollout_control.py

diff --git a/atest/rollout_control.py b/atest/rollout_control.py
index 9496d14..37c5435 100644
--- a/atest/rollout_control.py
+++ b/atest/rollout_control.py
@@ -175,15 +175,15 @@
     return is_enabled
 
 
-disable_bazel_mode_by_default = RolloutControlledFeature(
-    name='Bazel mode disabled by default',
+deprecate_bazel_mode = RolloutControlledFeature(
+    name='Deprecate Bazel Mode',
     rollout_percentage=10,
-    env_control_flag='DISABLE_BAZEL_MODE_BY_DEFAULT',
+    env_control_flag='DEPRECATE_BAZEL_MODE',
     feature_id=1,
     print_message=(
-        'Running host unit tests without bazel mode which is being deprecated.'
-        ' If you experienced any issues and require bazel mode, please comment'
-        ' on http://b/377371679.'
+        'Running host unit tests without bazel mode as bazel mode is'
+        ' deprecated. If you experienced any issues and require bazel mode,'
+        ' please comment on http://b/377371679.'
     ),
 )