commit 1e19f7dd61923b8835d9c6e1a7e560575dafaf1e
author Navil <navil@google.com> Wed Sep 11 16:49:49 2024 +0000
committer LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 12 16:15:50 2024 +0000
tree 2b0cf9d44af1a4ae52c68c0d86dad620d8331b19
parent d8b4101eae8d7b650c9fd27d4f6495a032187279

sync: include TARGET_RELEASE when constructing smart sync target.

When using the smart sync option, we try to construct the target that
was "lunched" from the TARGET_PRODUCT and TARGET_BUILD_VARIANT envvars.

However, an android target is now made of three parts,
{TARGET_PRODUCT}-{TARGET_RELEASE}-{TARGET_BUILD_VARIANT}.

I am leaving the option of creating a target if a TARGET_RELEASE is not
specified in case there are other consumers who depend on that option.

BUG=b:358101714
TEST=./run_tests
TEST=smart sync on android repo and manually inspecting
smart_sync_override.xml

Change-Id: I556137e33558783a86a0631f29756910b4a93d92
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/436977
Tested-by: Yiwei Zhang <yiwzhang@google.com>
Reviewed-by: Yiwei Zhang <yiwzhang@google.com>
Commit-Queue: Yiwei Zhang <yiwzhang@google.com>

subcmds/sync.py

diff --git a/subcmds/sync.py b/subcmds/sync.py
index 019ce3e..0ae59f5 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -1499,6 +1499,19 @@
                 elif (
                     "TARGET_PRODUCT" in os.environ
                     and "TARGET_BUILD_VARIANT" in os.environ
+                    and "TARGET_RELEASE" in os.environ
+                ):
+                    target = "%s-%s-%s" % (
+                        os.environ["TARGET_PRODUCT"],
+                        os.environ["TARGET_RELEASE"],
+                        os.environ["TARGET_BUILD_VARIANT"],
+                    )
+                    [success, manifest_str] = server.GetApprovedManifest(
+                        branch, target
+                    )
+                elif (
+                    "TARGET_PRODUCT" in os.environ
+                    and "TARGET_BUILD_VARIANT" in os.environ
                 ):
                     target = "%s-%s" % (
                         os.environ["TARGET_PRODUCT"],