Revert "Reland "AndroidService/MarkStable: Refactor commands.py function to service.""
This reverts commit eb8616c492bca1991e623129e83f45a3429c8f56.
Reason for revert: UprevAndroid is failing see https://crbug.com/982121.
Original change's description:
> Reland "AndroidService/MarkStable: Refactor commands.py function to service."
>
> This is a reland of e355c1c23c8ac209d91885ef31a6dcc38fbc3cfd
>
> Fixed some errors in the commands.py implementation of the endpoint
> and added a test for the method to sanity check it.
>
> BUG=chromium:956244
> TEST=run_tests
>
> Original change's description:
> > AndroidService/MarkStable: Refactor commands.py function to service.
> >
> > BUG=chromium:956244
> > TEST=run_tests
> >
> > Change-Id: I3333e5cf5fa22cb290bb0cccb7bead98ce673ded
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1682327
> > Tested-by: Alex Klein <saklein@chromium.org>
> > Reviewed-by: David Burger <dburger@chromium.org>
> > Reviewed-by: Evan Hernandez <evanhernandez@chromium.org>
> > Commit-Queue: Alex Klein <saklein@chromium.org>
>
> Bug: chromium:956244
> Change-Id: I3404f1f91ae148fc81549ef8e8cd6501958aa733
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1685412
> Tested-by: Alex Klein <saklein@chromium.org>
> Auto-Submit: Alex Klein <saklein@chromium.org>
> Reviewed-by: Evan Hernandez <evanhernandez@chromium.org>
> Commit-Queue: Alex Klein <saklein@chromium.org>
Bug: chromium:956244
Change-Id: I28411033c0f1d6bad17b2d183bcd541d9407e386
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1691788
Reviewed-by: David Burger <dburger@chromium.org>
Commit-Queue: David Burger <dburger@chromium.org>
Tested-by: David Burger <dburger@chromium.org>
diff --git a/api/controller/android.py b/api/controller/android.py
index ced3dcc..cdbb9aa 100644
--- a/api/controller/android.py
+++ b/api/controller/android.py
@@ -10,13 +10,12 @@
import os
from chromite.api import validate
-from chromite.api.controller import controller_util
from chromite.api.gen.chromite.api import android_pb2
-from chromite.lib import build_target_util
+# TODO(crbug/904939): implement service/android.
+from chromite.cbuildbot import commands
from chromite.lib import constants
from chromite.lib import osutils
from chromite.lib import portage_util
-from chromite.service import packages
ANDROIDPIN_MASK_PATH = os.path.join(constants.SOURCE_ROOT,
@@ -36,31 +35,30 @@
Args:
input_proto (MarkStableRequest): The input proto.
- output_proto (MarkStableResponse): The output proto.
+ output_proto (MarkStableReSponse): The output proto.
"""
- chroot = controller_util.ParseChroot(input_proto.chroot)
tracking_branch = input_proto.tracking_branch
package_name = input_proto.package_name
android_build_branch = input_proto.android_build_branch
android_version = input_proto.android_version
android_gts_build_branch = input_proto.android_gts_build_branch
-
- build_targets = []
- for build_target in input_proto.build_targets:
- build_targets.append(build_target_util.BuildTarget(build_target.name))
+ boards = input_proto.boards
+ buildroot = input_proto.buildroot
# Assume success.
output_proto.status = android_pb2.MARK_STABLE_STATUS_SUCCESS
+ # TODO(crbug/904939): This should move to service/android.py and the port
+ # should be finished.
try:
- android_atom_to_build = packages.uprev_android(
+ android_atom_to_build = commands.MarkAndroidAsStable(
+ buildroot=buildroot,
tracking_branch=tracking_branch,
android_package=package_name,
android_build_branch=android_build_branch,
- chroot=chroot,
- build_targets=build_targets,
+ boards=boards,
android_version=android_version,
android_gts_build_branch=android_gts_build_branch)
- except packages.AndroidIsPinnedUprevError as e:
+ except commands.AndroidIsPinnedUprevError as e:
# If the uprev failed due to a pin, CI needs to unpin and retry.
android_atom_to_build = e.new_android_atom
output_proto.status = android_pb2.MARK_STABLE_STATUS_PINNED
@@ -83,4 +81,5 @@
_input_proto (UnpinVersionRequest): The input proto. (not used.)
_output_proto (google.protobuf.Empty): The output proto. (not used.)
"""
+
osutils.SafeUnlink(ANDROIDPIN_MASK_PATH)