diff --git a/script/cfg.py b/script/cfg.py index 9e959f93..7d1002ab 100644 --- a/script/cfg.py +++ b/script/cfg.py @@ -219,7 +219,7 @@ def openqa_call_start_meta_variables(meta_variables): def pre_openqa_call_start(repos): return '' -openqa_call_start = lambda distri, version, archs, staging, news, news_archs, flavor_distri, meta_variables, assets_flavor, repo0folder: ''' +openqa_call_start = lambda distri, version, archs, staging, news, news_archs, flavor_distri, meta_variables, assets_flavor, repo0folder, openqa_cli: ''' archs=(ARCHITECTURS) [ ! -f __envsub/files_repo.lst ] || ! grep -q -- "-POOL-" __envsub/files_repo.lst || additional_repo_suffix=-POOL @@ -252,7 +252,7 @@ def pre_openqa_call_start(repos): ''' + openqa_call_news(news, news_archs) + ''' } fi - echo "/usr/bin/openqa-cli api -X post isos?async=1 \\\\\" + echo "''' + openqa_cli + ''' \\\\\" ( echo \" DISTRI=$distri \\\\ ARCH=$arch \\\\ diff --git a/script/scriptgen.py b/script/scriptgen.py index 1e0eb73c..64535e83 100644 --- a/script/scriptgen.py +++ b/script/scriptgen.py @@ -16,6 +16,7 @@ def __init__(self, envdir, project, productpath, version, brand): self.brand = brand self.envdir = os.path.join(envdir, project) self.distri = "" + self.openqa_cli = "/usr/bin/openqa-cli api -X post isos?async=1" self.version = version self.batches = [] project = project.split("::")[0] @@ -64,6 +65,8 @@ def doFile(self, filename): if root.attrib.get("distri", ""): self.distri = root.attrib["distri"] + self.openqa_cli = root.attrib.get("openqa_cli", self.openqa_cli) + for t in root.findall(".//batch"): batch = self.doBatch(t) if batch: @@ -957,6 +960,7 @@ def gen_print_openqa(self, f): self.meta_variables, self.assets_flavor, self.repo0folder, + self.ag.openqa_cli, ), f, "| grep $arch | head -n 1", @@ -975,6 +979,7 @@ def gen_print_openqa(self, f): self.meta_variables, self.assets_flavor, self.repo0folder, + self.ag.openqa_cli, ), f, ) diff --git a/t/abs/Test1/print_openqa.before b/t/abs/Test1/print_openqa.before index ffec7b8b..3cf2654f 100644 --- a/t/abs/Test1/print_openqa.before +++ b/t/abs/Test1/print_openqa.before @@ -1,4 +1,4 @@ -/usr/bin/openqa-cli api -X post isos?async=1 \ +echo \ ARCH=x86_64 \ ASSET_256=my-iso.x86_64-1.1.1-Build1.111.iso.sha256 \ BUILD=1.111 \ diff --git a/xml/abs/Test.xml b/xml/abs/Test.xml index 4d57a4ea..bf66140c 100644 --- a/xml/abs/Test.xml +++ b/xml/abs/Test.xml @@ -1,3 +1,3 @@ - +