commit cbe64c8352223c13ef9d45c43bedbbc26c7e9f29
author Derek Beckett <dbeckett@chromium.org> Thu May 05 15:00:18 2022 -0700
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri May 06 22:36:50 2022 +0000
tree b427e4cd2d78ec764d6e20ad1071e52f78dd5d2b
parent fc1db006166ea8d56bff916fee40e82fb77b8536

cft: parallelize container builders with newbuilders

These are all being marked as "non-critical" so that if they fail it
wont break existing builds. After the logs show it working I will turn
off the old builders and move these to critical.

BUG=b:230875828
TEST=unittest.

Cq-Depend: chromium:3630522
Change-Id: I7af011848c67480cea5482ab68cbe6ce6875b59a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3631023
Commit-Queue: Derek Beckett <dbeckett@chromium.org>
Tested-by: Derek Beckett <dbeckett@chromium.org>
Reviewed-by: Jaques Clapauch <jaquesc@google.com>

api/controller/test.py

diff --git a/api/controller/test.py b/api/controller/test.py
index fe82aea..5b467c6 100644
--- a/api/controller/test.py
+++ b/api/controller/test.py
@@ -174,6 +174,24 @@
             TEST_SERVICE_DIR,
             'plan/docker/build-dockerimage.sh',
         ),
+    'cros-provision-beta':
+        os.path.join(
+            TEST_SERVICE_DIR,
+            'python/src/docker_libs/cli/build-dockerimages.py'),
+    'cros-dut-beta':
+        os.path.join(
+            TEST_SERVICE_DIR,
+            'python/src/docker_libs/cli/build-dockerimages.py'),
+    'testplan-beta':
+        os.path.join(
+            TEST_SERVICE_DIR,
+            'python/src/docker_libs/cli/build-dockerimages.py',
+        ),
+    'cros-test-finder-beta':
+        os.path.join(
+            TEST_SERVICE_DIR,
+            'python/src/docker_libs/cli/build-dockerimages.py',
+        ),
 }
 
 
@@ -273,13 +291,17 @@
       cmd += ['--output', output_path]
 
       # Label flag is different for cros-test.
-      if human_name != 'cros-test':
-        cmd += labels
-
-      if human_name == 'cros-test' and labels:
+      if (human_name == 'cros-test' or 'beta' in human_name) and labels:
         # Translate generator to comma separated string.
         ct_labels = ','.join(labels)
         cmd += ['--labels', ct_labels]
+      else:
+        cmd += labels
+
+      if 'beta' in human_name:
+        # All the beta "human_name" are "service" appended with "-beta".
+        service = human_name.split('-beta')[0]
+        cmd += ['--service', service]
 
       result = test_pb2.TestServiceContainerBuildResult()
       result.name = human_name
@@ -298,7 +320,7 @@
             )
         )
       else:
-        if human_name == 'cros-test':
+        if 'beta' in human_name:
           logging.debug('%s build failed.\nStdout:\n%s\nStderr:\n%s',
                         human_name, cmd_result.stdout, cmd_result.stderr)
           result.success.CopyFrom(