commit cca7b66374b1da9f019811b7a3e51968f8c61578
author Derek Beckett <dbeckett@chromium.org> Fri Apr 22 16:59:43 2022 -0700
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 26 03:14:28 2022 +0000
tree 2ad3d1b7f488e638e35e1b7102a58a456110f20f
parent 0b1b0f5f17c31013aaf5a5d35db6bd77d63ff34a

cft: move cros-test to cloudbuild now that its working

BUG=b:228645277
TEST=unittests, and verified cros-test-cloud worked in post-submit.

Change-Id: I623a357dee7c164ceef2cf9a61954bd454229dc2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3603378
Tested-by: Derek Beckett <dbeckett@chromium.org>
Auto-Submit: Derek Beckett <dbeckett@chromium.org>
Reviewed-by: Jesse McGuire <jessemcguire@google.com>
Reviewed-by: Seewai Fu <seewaifu@google.com>
Reviewed-by: Jaques Clapauch <jaquesc@google.com>
Commit-Queue: Derek Beckett <dbeckett@chromium.org>

api/controller/test.py

diff --git a/api/controller/test.py b/api/controller/test.py
index e69b9dd..4fa149a 100644
--- a/api/controller/test.py
+++ b/api/controller/test.py
@@ -161,7 +161,7 @@
     'cros-test':
         os.path.join(
             PLATFORM_DEV_DIR,
-            'test/container/utils/build-dockerimage.sh'
+            'test/container/utils/cloudbuild-dockerimage.py'
         ),
     'cros-test-finder':
         os.path.join(
@@ -173,11 +173,6 @@
             TEST_SERVICE_DIR,
             'plan/docker/build-dockerimage.sh',
         ),
-    'cros-test-cloud':
-        os.path.join(
-            PLATFORM_DEV_DIR,
-            'test/container/utils/cloudbuild-dockerimage.py'
-        ),
 }
 
 
@@ -277,7 +272,7 @@
       cmd += ['--output', output_path]
 
       # Labels aren't support yet in cloudbuild script.
-      if human_name != 'cros-test-cloud':
+      if human_name != 'cros-test':
         cmd += labels
 
       result = test_pb2.TestServiceContainerBuildResult()
@@ -298,7 +293,7 @@
         )
       else:
         # Do not fail on cros-test-cloud as it is experimental.
-        if human_name == 'cros-test-cloud':
+        if human_name == 'cros-test':
 
           logging.debug('%s build failed.\nStdout:\n%s\nStderr:\n%s',
                         human_name, cmd_result.stdout, cmd_result.stderr)