commit d74c5ea53e3228b5976e213e48ad718aaac25557
author Andres Calderon Jaramillo <andrescj@google.com> Tue May 03 18:16:45 2022 +0000
committer Andres Calderon Jaramillo <andrescj@google.com> Tue May 03 18:18:03 2022 +0000
tree 459f699b8705b6e87a38b0a8e876b3894b5305f8
parent 25b452cb99e849b218a248cabd8331f4b9465d00

Revert "cft: move cros-test to new builder, mark non-critical"

This reverts commit 9d83d736beace7a8c307c1794e1869b09c82bbf2.

Reason for revert: causing widespread breakages (b/231330094).

Original change's description:
> cft: move cros-test to new builder, mark non-critical
>
> New builder for cros-test, so it needs to go back to non-critical to not
> block CQs/releases etc.
>
> BUG=b:230875828
> TEST=unittest, cq
>
> Cq-Depend: chromium:3621940
> Change-Id: I9e9161e3d9664bba0c31c9896d71348472243f88
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3620849
> Reviewed-by: Jaques Clapauch <jaquesc@google.com>
> Tested-by: Derek Beckett <dbeckett@chromium.org>
> Commit-Queue: Derek Beckett <dbeckett@chromium.org>

Bug: b:230875828
Change-Id: I5285ef1e37d5df0b9552d877b88817d8d07d15d8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3623702
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Andres Calderon Jaramillo <andrescj@google.com>
Auto-Submit: Andres Calderon Jaramillo <andrescj@google.com>
Owners-Override: Andres Calderon Jaramillo <andrescj@google.com>

api/controller/test.py

diff --git a/api/controller/test.py b/api/controller/test.py
index e5349ea..986b724 100644
--- a/api/controller/test.py
+++ b/api/controller/test.py
@@ -161,8 +161,8 @@
         os.path.join(TEST_SERVICE_DIR, 'dut/docker/build-dockerimage.sh'),
     'cros-test':
         os.path.join(
-            TEST_SERVICE_DIR,
-            'python/src/docker_libs/cli/build-dockerimages.py.py'
+            PLATFORM_DEV_DIR,
+            'test/container/utils/cloudbuild-dockerimage.py'
         ),
     'cros-test-finder':
         os.path.join(
@@ -298,20 +298,13 @@
             )
         )
       else:
-        if human_name == 'cros-test':
-          logging.debug('%s build failed.\nStdout:\n%s\nStderr:\n%s',
-                        human_name, cmd_result.stdout, cmd_result.stderr)
-          result.success.CopyFrom(
-              test_pb2.TestServiceContainerBuildResult.Success()
-          )
-        else:
-          logging.debug('%s build failed.\nStdout:\n%s\nStderr:\n%s',
-                        human_name, cmd_result.stdout, cmd_result.stderr)
-          result.failure.CopyFrom(
-              test_pb2.TestServiceContainerBuildResult.Failure(
-                  error_message=cmd_result.stdout
-              )
-          )
+        logging.debug('%s build failed.\nStdout:\n%s\nStderr:\n%s',
+                      human_name, cmd_result.stdout, cmd_result.stderr)
+        result.failure.CopyFrom(
+            test_pb2.TestServiceContainerBuildResult.Failure(
+                error_message=cmd_result.stdout
+            )
+        )
       output_proto.results.append(result)