yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #953 from mimi1vx/small_fixes

Browse Source 
Small fixes
This commit is contained in:
Stephan Kulow 2017-06-15 19:59:56 +02:00 committed by GitHub
commit 488e57d85c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/repos.json
View File

@ -49,7 +49,7 @@
"SUSE:Updates:SLE-DESKTOP:12-SP2:x86_64": {
"repos": [
"http://download.suse.de/ibs/SUSE/Updates/SLE-DESKTOP/12-SP2/x86_64/update/",
"http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-DESKTOP:/12-SP2:/x86_64/update",
"http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-DESKTOP:/12-SP2:/x86_64/update/",
"http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SDK:/12-SP2:/x86_64/update/",
"http://download.suse.de/ibs/SUSE/Updates/SLE-SDK/12-SP2/x86_64/update/"
],
@ -69,7 +69,7 @@
},
"repos": [
"http://download.suse.de/ibs/SUSE/Updates/SLE-SERVER/12-LTSS/x86_64/update/",
"http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SERVER:/12-LTSS:/x86_64/update"
"http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SERVER:/12-LTSS:/x86_64/update/"
],
"settings": [
{
@ -83,11 +83,11 @@
},
"SUSE:Updates:SLE-SERVER:12-SP1-LTSS:x86_64": {
"incidents": {
"OS": "SUSE:Maintenance:Test:SERVER:12-SP1-LTSS:x86_64"
"OS": "SUSE:Maintenance:Test:SLE-SERVER:12-SP1-LTSS:x86_64"
},
"repos": [
"http://download.suse.de/ibs/SUSE/Updates/SLE-SERVER/12-SP1-LTSS/x86_64/update/",
"http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SERVER:/12-SP1-LTSS:/x86_64/update"
"http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SERVER:/12-SP1-LTSS:/x86_64/update/"
],
"settings": [
{
@ -110,7 +110,7 @@
},
"repos": [
"http://download.suse.de/ibs/SUSE/Updates/SLE-SERVER/12-SP2/x86_64/update/",
"http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SERVER:/12-SP2:/x86_64/update",
"http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SERVER:/12-SP2:/x86_64/update/",
"http://download.suse.de/ibs/SUSE/Updates/SLE-SDK/12-SP2/x86_64/update/",
"http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SDK:/12-SP2:/x86_64/update/",
"http://download.suse.de/ibs/SUSE/Updates/SLE-WE/12-SP2/x86_64/update/",

16
openqa-maintenance.py
View File

@ -500,13 +500,14 @@ class OpenQABot(ReviewBot.ReviewBot):
def calculate_incidents(self, incidents):
"""
get incidet numbers from SUSE:Maintenance:Test project
get incident numbers from SUSE:Maintenance:Test project
returns dict with openQA var name : string with numbers
"""
l_incidents={}
l_incidents=[]
for kind, prj in incidents.items():
iid = ','.join([x.split('.')[1] for x in osc.core.meta_get_packagelist(self.apiurl, prj)])
l_incidents[kind+'_TEST_ISSUES']=iid
# TODO: unfortuanetly this works correctly only for IBS ( OBS using
# incident_NR )
l_incidents.append((kind + '_TEST_ISSUES', ','.join([x.split('.')[1] for x in osc.core.meta_get_packagelist(self.apiurl, prj)])))
return l_incidents
def jobs_for_target(self, data):
@ -558,11 +559,10 @@ class OpenQABot(ReviewBot.ReviewBot):
buildnr = "%s-%d" % (today, buildnr + 1)
for s in data['settings']:
if 'incidents' in data.keys():
incidents = self.calculate_incidents(data['incidents'])
for x,y in incidents.items():
s[x]=y
# now schedule it for real
if 'incidents' in data.keys():
for x,y in self.calculate_incidents(data['incidents']):
s[x]=y
s['BUILD'] = buildnr
s['REPOHASH'] = repohash
self.openqa.openqa_request('POST', 'isos', data=s, retries=1)