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

Use the JeOS-efi binaries for 15.1 arm images version reading

Browse Source 
Also use the actual openQA group name, which is now working properly.
This commit is contained in:
Fabian Vogt 2019-03-04 15:19:53 +01:00
parent a8e2c154ad
commit 43f25c4dbb
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
totest-manager.py
View File

@ -160,7 +160,7 @@ class ToTestBase(object):
if not base: if not base:
base = self.project_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|\.tar\.xz)', binary) result = re.match(r'.*-(?:Build|Snapshot)([0-9.]+)(?:-Media.*\.iso|\.docker\.tar\.xz|\.raw\.xz)', binary)
if result: if result:
return result.group(1) return result.group(1)
raise NotFoundException("can't find %s iso version" % project) raise NotFoundException("can't find %s iso version" % project)
@ -1017,14 +1017,15 @@ class ToTest151Images(ToTest150Images):
return 'openSUSE Leap 15.1 Images' return 'openSUSE Leap 15.1 Images'
class ToTest151ARMImages(ToTest151Images): class ToTest151ARMImages(ToTest151Images):
# JeOS uses multibuild, but listing all flavors here would be too much # JeOS uses multibuild, but listing all flavors here would be too much. Instead, list
image_products = [ImageProduct('JeOS', ['armv7l']), # the multibuild container itself, which releases all binaries.
ImageProduct('JeOS:JeOS-efi.aarch64', ['aarch64'])] image_products = [ImageProduct('JeOS:JeOS-efi.aarch64', ['aarch64']),
ImageProduct('JeOS', ['armv7l'])]
container_products = [ImageProduct('opensuse-leap-image:docker', ['aarch64'])] container_products = [ImageProduct('opensuse-leap-image:docker', ['aarch64'])]
def openqa_group(self): def openqa_group(self):
return 'openSUSE Leap 15.1 ARM Images' return 'openSUSE Leap 15.1 AArch64 Images'
def _release(self, set_release=None): def _release(self, set_release=None):
ToTestBase._release(self, set_release) ToTestBase._release(self, set_release)