commit 6a004565bbf6c39f075ef1bc41cbbd3a5eaffb7a
author Xixuan Wu <xixuan@google.com> Mon Dec 10 11:56:17 2018 -0800
committer Xixuan Wu <xixuan@chromium.org> Mon Dec 10 23:30:01 2018 +0000
tree 2ace93b62c337b1d5046f968b69d42cbaaa68a84
parent d91ae835c423bba8a67e03925a242d39d9ea8163

autotest: Keep pool unchanged if it's not pre-defined.

BUG=chromium:913623
TEST=Test in staging.

Change-Id: Icd9831633cdf2e38b5d8fdb4fda75f39934df1f3
Reviewed-on: https://chromium-review.googlesource.com/c/1370544
Commit-Queue: Xixuan Wu <xixuan@chromium.org>
Tested-by: Xixuan Wu <xixuan@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>

venv/skylab_suite/cros_suite.py

diff --git a/venv/skylab_suite/cros_suite.py b/venv/skylab_suite/cros_suite.py
index af59809..67a6947 100644
--- a/venv/skylab_suite/cros_suite.py
+++ b/venv/skylab_suite/cros_suite.py
@@ -406,7 +406,7 @@
         """Get available bots for suites."""
         bots = swarming_lib.query_bots_list({
                 'pool': swarming_lib.SKYLAB_DRONE_POOL,
-                'label-pool': swarming_lib.SWARMING_DUT_POOL_MAP.get(self.pool),
+                'label-pool': swarming_lib.to_swarming_pool_label(self.pool),
                 'label-board': self.board})
         return [bot for bot in bots if swarming_lib.bot_available(bot)]
 

venv/skylab_suite/suite_runner.py

diff --git a/venv/skylab_suite/suite_runner.py b/venv/skylab_suite/suite_runner.py
index 09918cd..9f6d9ed 100644
--- a/venv/skylab_suite/suite_runner.py
+++ b/venv/skylab_suite/suite_runner.py
@@ -271,7 +271,7 @@
         test_spec.test.name = 'Echo ' + test_spec.test.name
 
     dimensions = {'pool': swarming_lib.SKYLAB_DRONE_POOL,
-                  'label-pool': swarming_lib.SWARMING_DUT_POOL_MAP.get(
+                  'label-pool': swarming_lib.to_swarming_pool_label(
                           test_spec.pool),
                   'label-board': test_spec.board,
                   'dut_state': swarming_lib.SWARMING_DUT_READY_STATUS}

venv/skylab_suite/swarming_lib.py

diff --git a/venv/skylab_suite/swarming_lib.py b/venv/skylab_suite/swarming_lib.py
index a17f823..cfc35a0 100644
--- a/venv/skylab_suite/swarming_lib.py
+++ b/venv/skylab_suite/swarming_lib.py
@@ -122,6 +122,11 @@
             'chromiumos/chromite/third_party/swarming.client/swarming.py')
 
 
+def to_swarming_pool_label(pool):
+    """Transfer passed-in suite pool label to swarming-recognized pool label."""
+    return SWARMING_DUT_POOL_MAP.get(pool, pool)
+
+
 def get_basic_swarming_cmd(command):
     return [_get_client(), command,
             '--auth-service-account-json', SERVICE_ACCOUNT,