commit d6361fadd6607ca871326a306340597a7591fd83
author Ilja H. Friedel <ihf@chromium.org> Tue Oct 16 23:33:25 2018 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Thu Oct 25 16:15:25 2018 +0000
tree a1844a68570de4ea9641d9ef3891fbd5319d8f48
parent 6b9a7e5aad34b0badb41a6c08c0f3c4e097e4553

cros_label: introduce cpu labels for CTS_instant

BUG=b:113781643
TEST=pylint

Change-Id: Ia213134bce91a78e54756c74ab5ba6411f52e324
Reviewed-on: https://chromium-review.googlesource.com/1286349
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Pohsien Wang <pwang@chromium.org>
Reviewed-by: Keith Haddow <haddowk@chromium.org>
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
(cherry picked from commit a7502f5ac4f63ced4b125e73b4d5de0cd799b507)
Reviewed-on: https://chromium-review.googlesource.com/c/1299456
Commit-Queue: Keith Haddow <haddowk@chromium.org>
Tested-by: Keith Haddow <haddowk@chromium.org>
Trybot-Ready: Keith Haddow <haddowk@chromium.org>

server/hosts/cros_label.py

diff --git a/server/hosts/cros_label.py b/server/hosts/cros_label.py
index 87daa73..6face01 100644
--- a/server/hosts/cros_label.py
+++ b/server/hosts/cros_label.py
@@ -454,20 +454,31 @@
 
 class CtsArchLabel(base_label.StringLabel):
     """Labels to determine the abi of the CTS bundle (arm or x86 only)."""
-    # TODO(ihf): create labels for ABIs supported by container like x86_64.
 
-    _NAME = ['cts_abi_arm', 'cts_abi_x86']
+    _NAME = ['cts_abi_arm', 'cts_abi_x86', 'cts_cpu_arm', 'cts_cpu_x86']
 
-    def _get_cts_abis(self, host):
+    def _get_cts_abis(self, arch):
         """Return supported CTS ABIs.
 
         @return List of supported CTS bundle ABIs.
         """
         cts_abis = {'x86_64': ['arm', 'x86'], 'arm': ['arm']}
-        return cts_abis.get(host.get_cpu_arch(), [])
+        return cts_abis.get(arch, [])
+
+    def _get_cts_cpus(self, arch):
+        """Return supported CTS native CPUs.
+
+        This is needed for CTS_Instant scheduling.
+        @return List of supported CTS native CPUs.
+        """
+        cts_cpus = {'x86_64': ['x86'], 'arm': ['arm']}
+        return cts_cpus.get(arch, [])
 
     def generate_labels(self, host):
-        return ['cts_abi_' + abi for abi in self._get_cts_abis(host)]
+        cpu_arch = host.get_cpu_arch()
+        abi_labels = ['cts_abi_' + abi for abi in self._get_cts_abis(cpu_arch)]
+        cpu_labels = ['cts_cpu_' + cpu for cpu in self._get_cts_cpus(cpu_arch)]
+        return abi_labels + cpu_labels
 
 
 class SparseCoverageLabel(base_label.StringLabel):