Merge pull request #552 from nilxam/update_20160812

Do not submit the packages has been dropped
This commit is contained in:
Ludwig Nussel 2016-08-12 10:41:31 +02:00 committed by GitHub
commit 900b80e6d4

View File

@ -133,7 +133,9 @@ class FccSubmitter(object):
'SUSE:SLE-12:GA', 'SUSE:SLE-12:GA',
] ]
# the skip list against devel project # the skip list against devel project
self.skip_devel_project_list = [] self.skip_devel_project_list = [
'mobile:synchronization:FACTORY'
]
# put the except packages from skip_devel_project_list, use regex in this list, eg. "^golang-x-(\w+)", "^nodejs$" # put the except packages from skip_devel_project_list, use regex in this list, eg. "^golang-x-(\w+)", "^nodejs$"
self.except_pkgs_list = [] self.except_pkgs_list = []
# put the exact package name here # put the exact package name here
@ -141,12 +143,8 @@ class FccSubmitter(object):
'python-pypuppetdb$', 'python-pypuppetdb$',
'smbtad', 'smbtad',
'mdds-1_2', 'mdds-1_2',
'e17-theme-a-os-vision-v3', '^e17',
'e17-branding-openSUSE',
'e17-theme-a-os-miguel-v3',
'shellementary', 'shellementary',
'e17-theme-a-os-agust-v3',
'e17-theme-openSUSE',
'aer-inject', 'aer-inject',
'xplatproviders', 'xplatproviders',
'newlib', 'newlib',
@ -158,6 +156,7 @@ class FccSubmitter(object):
'^libxml', '^libxml',
'w3m-el', 'w3m-el',
'scim$', 'scim$',
'^scim-(\w+)',
'gstreamer-0_10-plugins-gl', 'gstreamer-0_10-plugins-gl',
'libgdamm', 'libgdamm',
'gtk3-metatheme-sonar', 'gtk3-metatheme-sonar',
@ -171,10 +170,24 @@ class FccSubmitter(object):
'kdelibs3', 'kdelibs3',
'qca-sasl', 'qca-sasl',
'mozaddon-gnotifier', 'mozaddon-gnotifier',
'khunphan',
'lxcfs',
'containerd',
'docker-bench-security',
'0ad-data',
'python-plaso',
'gnome-news',
'wdm',
'nuntius',
'gobby04',
'jamin',
'^bundle-lang',
'docker-image-migrator',
'kiwi-config-openSUSE' 'kiwi-config-openSUSE'
] ]
self.check_later = [ self.check_later = [
'tulip' 'tulip',
'khunphan',
] ]
def get_source_packages(self, project, expand=False): def get_source_packages(self, project, expand=False):
@ -298,6 +311,20 @@ class FccSubmitter(object):
print '-------------------------------------' print '-------------------------------------'
print "Found {} build succeded packages".format(len(succeeded_packages)) print "Found {} build succeded packages".format(len(succeeded_packages))
def get_deleted_packages(self, project):
query = 'states=accepted&types=delete&project={}&view=collection'
query = query.format(project)
url = makeurl(self.apiurl, ['request'], query)
f = http_GET(url)
root = ET.parse(f).getroot()
pkgs = []
for sr in root.findall('request'):
tgt_package = sr.find('action').find('target').get('package')
pkgs.append(tgt_package)
return pkgs
def crawl(self): def crawl(self):
"""Main method""" """Main method"""
succeeded_packages = [] succeeded_packages = []
@ -310,12 +337,17 @@ class FccSubmitter(object):
random.shuffle(succeeded_packages) random.shuffle(succeeded_packages)
# get souce packages from target # get souce packages from target
target_packages = self.get_source_packages(self.to_prj) target_packages = self.get_source_packages(self.to_prj)
deleted_packages = self.get_deleted_packages(self.to_prj)
ms_packages = [] # collect multi specs packages ms_packages = [] # collect multi specs packages
for i in range(0, min(int(self.submit_limit), len(succeeded_packages))): for i in range(0, min(int(self.submit_limit), len(succeeded_packages))):
package = succeeded_packages[i] package = succeeded_packages[i]
if package in deleted_packages:
logging.info('%s has been dropped from %s, ignore it!'%(package, self.to_prj))
continue
if self.is_sle_base_pkgs(package) is True: if self.is_sle_base_pkgs(package) is True:
logging.info('%s origin from SLE base, skip for now!'%package) logging.info('%s origin from SLE base, skip for now!'%package)
continue continue