commit 27eaa16b22d452ebc7111b7f6f4066ea9dde643e
author Derek Beckett <dbeckett@chromium.org> Mon May 09 10:42:53 2022 -0700
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon May 09 23:03:23 2022 +0000
tree 5137cd32dd2600fe7e400542fd40354a48a5b9e3
parent 239459af80e66ce079737a38f842f28f64fc76cc

cft: promote new_builders to stable

as per crrev.com/c/3631023, promoting these to stable, as they built for
~3 days without issues.

BUG=b:230875828
TEST=unittest. (see any builder for stability proof)

Change-Id: Ia61eff7d8f4abe97dc5ae48a7a70c63c9527ab64
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3635007
Reviewed-by: Seewai Fu <seewaifu@google.com>
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 5b467c6..7aa140d 100644
--- a/api/controller/test.py
+++ b/api/controller/test.py
@@ -155,39 +155,25 @@
 PLATFORM_DEV_DIR = os.path.join(SRC_DIR, 'platform/dev')
 TEST_SERVICE_DIR = os.path.join(PLATFORM_DEV_DIR, 'src/chromiumos/test')
 TEST_CONTAINER_BUILD_SCRIPTS = {
-    'cros-provision':
-        os.path.join(TEST_SERVICE_DIR, 'provision/docker/build-dockerimage.sh'),
-    'cros-dut':
-        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'
         ),
-    'cros-test-finder':
-        os.path.join(
-            TEST_SERVICE_DIR,
-            'test_finder/docker/build-dockerimage.sh',
-        ),
-    'cros-testplan':
-        os.path.join(
-            TEST_SERVICE_DIR,
-            'plan/docker/build-dockerimage.sh',
-        ),
-    'cros-provision-beta':
+    'cros-provision':
         os.path.join(
             TEST_SERVICE_DIR,
             'python/src/docker_libs/cli/build-dockerimages.py'),
-    'cros-dut-beta':
+    'cros-dut':
         os.path.join(
             TEST_SERVICE_DIR,
             'python/src/docker_libs/cli/build-dockerimages.py'),
-    'testplan-beta':
+    'testplan':
         os.path.join(
             TEST_SERVICE_DIR,
             'python/src/docker_libs/cli/build-dockerimages.py',
         ),
-    'cros-test-finder-beta':
+    'cros-test-finder':
         os.path.join(
             TEST_SERVICE_DIR,
             'python/src/docker_libs/cli/build-dockerimages.py',
@@ -290,18 +276,11 @@
       cmd += ['--tags', tags]
       cmd += ['--output', output_path]
 
-      # Label flag is different for cros-test.
-      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
+      # Translate generator to comma separated string.
+      ct_labels = ','.join(labels)
+      cmd += ['--labels', ct_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]
+      cmd += ['--service', human_name]
 
       result = test_pb2.TestServiceContainerBuildResult()
       result.name = human_name
@@ -320,20 +299,13 @@
             )
         )
       else:
-        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(
-              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)
 
 

api/controller/test_unittest.py

diff --git a/api/controller/test_unittest.py b/api/controller/test_unittest.py
index 37174c1..2138370 100644
--- a/api/controller/test_unittest.py
+++ b/api/controller/test_unittest.py
@@ -416,10 +416,7 @@
         self.api_config)
     patch.assert_called()
     for result in response.results:
-      if 'beta' in result.name:
-        self.assertEqual(result.WhichOneof('result'), 'success')
-      else:
-        self.assertEqual(result.WhichOneof('result'), 'failure')
+      self.assertEqual(result.WhichOneof('result'), 'failure')
 
 class ChromiteUnitTestTest(cros_test_lib.MockTestCase,
                            api_config.ApiConfigMixin):