commit a8d9fd271f64257a857db7929508a2cea588c49c
author Derek Beckett <dbeckett@chromium.org> Wed Apr 27 10:44:52 2022 -0700
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Apr 30 03:00:14 2022 +0000
tree afcf4002b8538e1e4fdb6562d3a1a5e0bfc02d89
parent 70481203883a8c3ed31f5db7b7dc212028bb45da

cft: re-enable label flag for cros-test

BUG=b:228645277
TEST=unittest

Cq-Depend: chromium:3611642
Change-Id: I979a479aeb65f139b0aaff1396ebf44520212278
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3610695
Reviewed-by: Jaques Clapauch <jaquesc@google.com>
Reviewed-by: Azizur Rahman <azrahman@google.com>
Commit-Queue: Derek Beckett <dbeckett@chromium.org>
Tested-by: Derek Beckett <dbeckett@chromium.org>

api/controller/test.py

diff --git a/api/controller/test.py b/api/controller/test.py
index 1c7a932..ec1ef7c 100644
--- a/api/controller/test.py
+++ b/api/controller/test.py
@@ -271,10 +271,15 @@
       cmd += ['--tags', tags]
       cmd += ['--output', output_path]
 
-      # Labels aren't support yet in cloudbuild script.
+      # Label flag is different for cros-test.
       if human_name != 'cros-test':
         cmd += labels
 
+      if human_name == 'cros-test' and labels:
+        # Translate generator to comma separated string.
+        ct_labels = ','.join(labels)
+        cmd += ['--labels', ct_labels]
+
       result = test_pb2.TestServiceContainerBuildResult()
       result.name = human_name