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

Remove overloaded iso_ and ftp_ function for SLE

Browse Source 
All your base belong to us!
This commit is contained in:
Stephan Kulow 2019-03-25 15:26:43 +01:00
parent 2f1c2cb2e6
commit c7a81596bc
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
totest-manager.py
View File

@ -136,18 +136,14 @@ class ToTestBase(object):
def get_current_snapshot(self): def get_current_snapshot(self):
return self.iso_build_version(self.test_project, self.main_products[0]) return self.iso_build_version(self.test_project, self.main_products[0])
def ftp_build_version(self, project, tree, base=None): def ftp_build_version(self, project, tree):
if not base:
base = self.project_base
for binary in self.binaries_of_product(project, tree): for binary in self.binaries_of_product(project, tree):
result = re.match(r'%s.*Build(.*)-Media1.report' % base, binary) result = re.match(r'.*-Build(.*)-Media1.report', binary)
if result: if result:
return result.group(1) return result.group(1)
raise NotFoundException("can't find %s ftp version" % project) raise NotFoundException("can't find %s ftp version" % project)
def iso_build_version(self, project, tree, base=None, repo=None, arch=None): def iso_build_version(self, project, tree, repo=None, arch=None):
if not base:
base = self.project_base
for binary in self.binaries_of_product(project, tree, repo=repo, arch=arch): for binary in self.binaries_of_product(project, tree, repo=repo, arch=arch):
result = re.match(r'.*-(?:Build|Snapshot)([0-9.]+)(?:-Media.*\.iso|\.docker\.tar\.xz|\.raw\.xz)', binary) result = re.match(r'.*-(?:Build|Snapshot)([0-9.]+)(?:-Media.*\.iso|\.docker\.tar\.xz|\.raw\.xz)', binary)
if result: if result:
@ -1008,13 +1004,6 @@ class ToTestSLE(ToTestBaseNew):
def openqa_group(self): def openqa_group(self):
return 'Functional' return 'Functional'
def ftp_build_version(self, project, tree):
return super(ToTestSLE, self).ftp_build_version(project, tree, base='SLE')
def iso_build_version(self, project, tree):
return super(ToTestSLE, self).iso_build_version(project, tree, base='SLE')
class ToTestSLE12(ToTestSLE): class ToTestSLE12(ToTestSLE):
main_products = [ main_products = [
'_product:SLES-dvd5-DVD-aarch64', '_product:SLES-dvd5-DVD-aarch64',