Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion script/scriptgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -554,8 +554,19 @@ def gen_read_files(self, f):
"Media1?.iso$",
iso,
)
else:
elif self.media1 != "0":
self.p(cfg.read_files_iso, f, "FOLDER", self.iso_folder.get(iso, ""), "SRCISO", iso)
else:
self.p(
cfg.read_files_iso,
f,
"FOLDER",
self.iso_folder.get(iso, ""),
"SRCISO",
iso,
"Media1?.iso$",
".iso$",
)

if self.repolink:
self.p(cfg.read_files_repo_link, f)
Expand Down
4 changes: 4 additions & 0 deletions t/obs/openSUSE:Leap:16.0:Images:ToTest/files_iso.lst
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso
agama-installer-openSUSE.ppc64le-9.0.0-openSUSE-Build4.9.iso
agama-installer-openSUSE.s390x-9.0.0-openSUSE-Build4.9.iso
agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso
22 changes: 22 additions & 0 deletions t/obs/openSUSE:Leap:16.0:Images:ToTest/print_openqa.before
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/usr/bin/openqa-cli api -X post isos?async=1 \
ARCH=aarch64 \
ASSET_256=agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso.sha256 \
BUILD=4.9 \
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=opensuse \
FLAVOR=agama-installer-openSUSE \
ISO=agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso \
VERSION=16.0 \
_OBSOLETE=1

/usr/bin/openqa-cli api -X post isos?async=1 \
ARCH=x86_64 \
ASSET_256=agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso.sha256 \
BUILD=4.9 \
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=opensuse \
FLAVOR=agama-installer-openSUSE \
ISO=agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso \
VERSION=16.0 \
_OBSOLETE=1

4 changes: 4 additions & 0 deletions t/obs/openSUSE:Leap:16.0:Images:ToTest/print_rsync_iso.before
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:Images:ToTest/images/*/*agama-installer-openSUSE*/*agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso /var/lib/openqa/factory/iso/agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:Images:ToTest/images/*/*agama-installer-openSUSE*/*agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso.sha256 /var/lib/openqa/factory/other/agama-installer-openSUSE.aarch64-9.0.0-openSUSE-Build4.9.iso.sha256
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:Images:ToTest/images/*/*agama-installer-openSUSE*/*agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso /var/lib/openqa/factory/iso/agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:Images:ToTest/images/*/*agama-installer-openSUSE*/*agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso.sha256 /var/lib/openqa/factory/other/agama-installer-openSUSE.x86_64-9.0.0-openSUSE-Build4.9.iso.sha256
Empty file.
7 changes: 7 additions & 0 deletions xml/obs/openSUSE:Leap:16.0:Images.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<openQA
project_pattern="openSUSE:Leap:(?P&lt;version&gt;16.0):Images:ToTest"
dist_path="images"
distri="opensuse"
archs="aarch64 x86_64">
<flavor name="agama-installer-openSUSE" folder="*/*agama-installer-openSUSE*" iso="1" media1="0"/>
</openQA>