From 926f657f0a2c368b81edb684edfd40c03bd89c91 Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Sun, 10 May 2020 16:45:09 +0200 Subject: [PATCH] suite: allow override architecture By default for generation job configuration and filtering them out there is 'arch' field is used determined automatically via request to paddles database for give machine_type. This makes it possible to override the 'arch' value with teuthology-suite '--arch' parameter. This is only useful at the moment just when a user don't one to make any request to paddles. Originally the arch is used to filter out the suites which are not supposed to be queued on the given nodes. In future we probably need to have tests with heterogeneous configuration which will use multiple architectures. Signed-off-by: Kyr Shatskyy --- scripts/suite.py | 4 ++++ teuthology/suite/run.py | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/suite.py b/scripts/suite.py index 5805ec9a2b..59036f5992 100644 --- a/scripts/suite.py +++ b/scripts/suite.py @@ -96,6 +96,10 @@ Standard arguments: of resources, however --non-interactive option can be used to skip user input. [default: 0] + --arch Override architecture defaults, for example, + aarch64, armv7l, x86_64. Normally this + argument should not be provided and the arch + is determined from --machine-type. Scheduler arguments: --owner Job owner diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py index e63fb562bb..1a71404b13 100644 --- a/teuthology/suite/run.py +++ b/teuthology/suite/run.py @@ -498,7 +498,11 @@ class Run(object): Schedule the suite-run. Returns the number of jobs scheduled. """ name = self.name - arch = util.get_arch(self.base_config.machine_type) + if self.args.arch: + arch = self.args.arch + log.debug("Using '%s' as an arch" % arch) + else: + arch = util.get_arch(self.base_config.machine_type) suite_name = self.base_config.suite suite_path = os.path.normpath(os.path.join( self.suite_repo_path, -- 2.39.5