commit 24742ac1a6a7f88da3b608d2cfd62629d1cff9cd
author Otabek Kasimov <otabek@google.com> Wed Dec 09 18:55:57 2020 -0800
committer Commit Bot <commit-bot@chromium.org> Fri Dec 11 22:38:28 2020 +0000
tree 91ce9e5ee01e04f96dae3fd69394c3f96816c830
parent 952e7f4e88c1db57c84d813c10ed2db892ec4e71

deploy: Update sequence of action to match lucifer

BUG=b:169286392
TEST=run local deployment action

Change-Id: I00eb7abe29478ada85de1ffaf259374ea99b0d9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2583334
Commit-Queue: Otabek Kasimov <otabek@google.com>
Tested-by: Otabek Kasimov <otabek@google.com>
Reviewed-by: Garry Wang <xianuowang@chromium.org>

site_utils/deployment/prepare/main.py

diff --git a/site_utils/deployment/prepare/main.py b/site_utils/deployment/prepare/main.py
index cd2676b..8f2256f 100755
--- a/site_utils/deployment/prepare/main.py
+++ b/site_utils/deployment/prepare/main.py
@@ -66,6 +66,8 @@
             logging.info('DRY RUN: Would have run actions %s', opts.actions)
             return
 
+        is_labstation = (host_info.get().os == "labstation")
+
         if 'stage-usb' in opts.actions:
             try:
                 repair_image = afe_utils.get_stable_cros_image_name_v2(
@@ -91,20 +93,6 @@
                 logging.error("fail to install firmware: %s", err)
                 return RETURN_CODES.INSTALL_FIRMWARE_FAILURE
 
-        if 'run-pre-deploy-verification' in opts.actions:
-            try:
-                if host_info.get().os == "labstation":
-                    logging.info("testing RPM information on labstation")
-                    preparedut.verify_labstation_RPM_config_unsafe(host)
-                else:
-                    preparedut.verify_servo(host)
-                    preparedut.verify_battery_status(host)
-                    preparedut.verify_ccd_testlab_enable(host)
-                    rpm_validator.verify_unsafe(host)
-            except Exception as err:
-                logging.error("fail on pre-deploy verification: %s", err)
-                return RETURN_CODES.PRE_DEPLOY_VERIFICATION_FAILURE
-
         if 'verify-recovery-mode' in opts.actions:
             try:
                 preparedut.verify_boot_into_rec_mode(host)
@@ -112,6 +100,7 @@
                 logging.error("fail to boot from recovery mode: %s", err)
                 return RETURN_CODES.BOOT_FROM_RECOVERY_MODE_FAILURE
 
+        # TODO (otabek): mix this step with update-label later.
         if 'setup-labstation' in opts.actions:
             try:
                 preparedut.setup_hwid_and_serialnumber(host)
@@ -122,11 +111,26 @@
         if 'update-label' in opts.actions:
             try:
                 preparedut.setup_hwid_and_serialnumber(host)
-                host.labels.update_labels(host, task_name='deploy')
+                if not is_labstation:
+                    host.labels.update_labels(host, task_name='deploy')
             except Exception as err:
                 logging.error("fail to update label: %s", err)
                 return RETURN_CODES.UPDATE_LABEL_FAILURE
 
+        if 'run-pre-deploy-verification' in opts.actions:
+            try:
+                if is_labstation:
+                    logging.info("testing RPM information on labstation")
+                    preparedut.verify_labstation_RPM_config_unsafe(host)
+                else:
+                    preparedut.verify_servo(host)
+                    preparedut.verify_battery_status(host)
+                    preparedut.verify_ccd_testlab_enable(host)
+                    rpm_validator.verify_unsafe(host)
+            except Exception as err:
+                logging.error("fail on pre-deploy verification: %s", err)
+                return RETURN_CODES.PRE_DEPLOY_VERIFICATION_FAILURE
+
     return RETURN_CODES.OK