From b97c86aa1cb5f84e8269df386363767ada437d11 Mon Sep 17 00:00:00 2001 From: Denys Fedoryshchenko Date: Tue, 16 Jan 2024 08:52:58 +0200 Subject: [PATCH] kbuild.py: Remove hardcoded staging config Cleanup, remove staging config left by mistake. Signed-off-by: Denys Fedoryshchenko --- kernelci/kbuild.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/kernelci/kbuild.py b/kernelci/kbuild.py index 8a3570e38c..1c9006beaf 100644 --- a/kernelci/kbuild.py +++ b/kernelci/kbuild.py @@ -104,6 +104,7 @@ def __init__(self, node=None, jobname=None, params=None, jsonobj=None): self._firmware_dir = None self._af_dir = None self._node = node + self._api_config = None return # load class from serialized json if jsonobj: @@ -124,6 +125,7 @@ def __init__(self, node=None, jobname=None, params=None, jsonobj=None): self._apijobname = jsonobj['apijobname'] self._storage_config = jsonobj['storage_config'] self._fragments_dir = jsonobj['fragments_dir'] + self._api_config = jsonobj['api_config'] return raise ValueError("No valid arguments provided") @@ -155,8 +157,9 @@ def set_workspace(self, workspace): self._srcdir = os.path.join(self._workspace, "linux") self.init_steps() - def set_api_config(self, api_config): + def set_api_config(self, api_yaml): """ Set API config """ + api_config = yaml.safe_load(api_yaml) self._api_config = api_config def set_storage_config(self, storage_config): @@ -519,11 +522,7 @@ def submit(self, retcode): api_token = os.environ.get('KCI_API_TOKEN') if not api_token: raise ValueError("KCI_API_TOKEN is not set") - config = '/etc/kernelci/core/api-configs.yaml' - configs = kernelci.config.load(config) - api = 'staging.kernelci.org' - api_config = configs['api'][api] - api = kernelci.api.get_api(api_config, api_token) + api = kernelci.api.get_api(self._api_config, api_token) # TODO/FIXME: real detailed job result # pass fail skip incomplete if retcode != 0: