commit 917ee3384ba759b53c7e4814c250a9f2241490ac
author Gregory Nisbet <gregorynisbet@google.com> Thu Sep 05 11:41:23 2019 -0700
committer Gregory Nisbet <gregorynisbet@google.com> Thu Sep 05 19:14:24 2019 +0000
tree 6d0e04ede9b130b817dc5ddfdacb13d6098ef964
parent 1eb69ac9aa5530b8170ca4d71dc058c1c4f9311b

Autotest: optionally use quick-add-duts

Change-Id: I97e01a87577cfd5019d336e1d7aed7c71d05a0e2
Bug: n/a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/1779139
Reviewed-by: Gregory Nisbet <gregorynisbet@google.com>
Reviewed-by: Xixuan Wu <xixuan@chromium.org>
Commit-Queue: Gregory Nisbet <gregorynisbet@google.com>
Tested-by: Gregory Nisbet <gregorynisbet@google.com>
Auto-Submit: Gregory Nisbet <gregorynisbet@google.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>

cli/host.py

diff --git a/cli/host.py b/cli/host.py
index 37fac07..c3a789f 100644
--- a/cli/host.py
+++ b/cli/host.py
@@ -1196,7 +1196,7 @@
                             host, MIGRATED_HOST_SUFFIX)
                 else:
                     #for_rollback
-                    new_hostname = _remove_hostname_suffix(
+                    new_hostname = _remove_hostname_suffix_if_present(
                             host, MIGRATED_HOST_SUFFIX)
 
                 if not self.dryrun:
@@ -1539,7 +1539,12 @@
                                help='Pool of the hosts to migrate',
                                dest='pool',
                                default=None)
-
+        # TODO(gregorynisbet): remove this flag and make quick-add-duts default.
+        self.parser.add_option('-q',
+                               '--use-quick-add',
+                               help='whether to use "skylab quick-add-duts"',
+                               dest='use_quick_add',
+                               action='store_true')
     def parse(self):
         (options, leftover) = super(host_skylab_migrate, self).parse()
         self.dry_run = options.dry_run
@@ -1549,6 +1554,7 @@
         self.pool = options.pool
         self.board = options.board
         self._reason = "migration to skylab: %s" % self.bug_number
+        self.use_quick_add = options.use_quick_add
         return (options, leftover)
 
 
@@ -1633,6 +1639,7 @@
             interval_len=2,
             min_ready_intervals=10,
             immediately=True,
+            use_quick_add=self.use_quick_add,
         )
         return res