From 521cec9c00317a9556d1c93f6888c9d20f002a11 Mon Sep 17 00:00:00 2001 From: Dinar Valeev Date: Tue, 31 Mar 2015 15:35:30 +0200 Subject: [PATCH] Add group to the openQA query Query openQA results by Job group Signed-off-by: Dinar Valeev --- osclib/stagingapi.py | 1 + totest-manager.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/osclib/stagingapi.py b/osclib/stagingapi.py index 7eb138c9..ab1c193d 100644 --- a/osclib/stagingapi.py +++ b/osclib/stagingapi.py @@ -78,6 +78,7 @@ class StagingAPI(object): return makeurl(self.apiurl, l, query) def retried_GET(self, url): + url = urllib2.quote(url, safe=':/?=&') try: return http_GET(url) except urllib2.HTTPError, e: diff --git a/totest-manager.py b/totest-manager.py index 88d66e79..47944718 100755 --- a/totest-manager.py +++ b/totest-manager.py @@ -61,6 +61,9 @@ class ToTestBase(object): return ret + def openqa_group(self): + return self.project + def get_current_snapshot(self): """Return the current snapshot in :ToTest""" @@ -79,8 +82,9 @@ class ToTestBase(object): """ + group = 'openSUSE' + ' ' + self.openqa_version() + ' ' + self.openqa_group() url = 'https://openqa.opensuse.org/api/v1/' \ - 'jobs?version={}&build={}&distri=opensuse'.format(self.openqa_version(), snapshot) + 'jobs?version={}&build={}&distri=opensuse&group={}'.format(self.openqa_version(), snapshot, group) f = self.api.retried_GET(url) jobs = [] for job in json.load(f)['jobs']: @@ -368,6 +372,9 @@ class ToTestFactory(ToTestBase): def openqa_version(self): return 'Tumbleweed' + def openqa_group(self): + return '' + def iso_prefix(self): return 'Tumbleweed' @@ -403,6 +410,9 @@ class ToTestFactoryPowerPC(ToTestBase): def openqa_version(self): return 'Tumbleweed' + def openqa_group(self): + return 'PowerPC' + def arch(self): return 'ppc64le'