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
1 change: 1 addition & 0 deletions script/cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ def pre_rsync_repo(repos):
[ ! -f __envsub/files_repo.lst ] || ! grep -q -- "-POOL-" __envsub/files_repo.lst || additional_repo_suffix=-POOL
[ -n "$buildid" ] || buildid=$(grep -hEo 'Build[0-9]+(.[0-9]+)?' __envsub/Media1_*.lst 2>/dev/null | head -n 1)

buildid=${buildid/.install}
buildid=${buildid/.iso}
'''

Expand Down
4 changes: 4 additions & 0 deletions t/obs/openSUSE:Leap:16.0:ToTest/files_iso.lst
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ Leap-16.0-offline-installer-aarch64-Build1.3.install.iso
Leap-16.0-offline-installer-ppc64le-Build1.3.install.iso
Leap-16.0-offline-installer-s390x-Build1.3.install.iso
Leap-16.0-offline-installer-x86_64-Build1.3.install.iso
Leap-16.0-online-installer-aarch64-Build1.3.install.iso
Leap-16.0-online-installer-ppc64le-Build1.3.install.iso
Leap-16.0-online-installer-s390x-Build1.3.install.iso
Leap-16.0-online-installer-x86_64-Build1.3.install.iso
32 changes: 16 additions & 16 deletions t/obs/openSUSE:Leap:16.0:ToTest/print_openqa.before
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/usr/bin/openqa-cli api -X post isos?async=1 \
ARCH=aarch64 \
ASSET_256=agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso.sha256 \
ASSET_256=Leap-16.0-online-installer-aarch64-Build1.3.install.iso.sha256 \
BUILD=1.3 \
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/Leap-16.0-online-installer-aarch64-Build1.3.install.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=opensuse \
FLAVOR=agama-installer-Leap \
FLAVOR=online-installer \
FULLURL=1 \
ISO=agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso \
ISO=Leap-16.0-online-installer-aarch64-Build1.3.install.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
Expand All @@ -21,13 +21,13 @@

/usr/bin/openqa-cli api -X post isos?async=1 \
ARCH=x86_64 \
ASSET_256=agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso.sha256 \
ASSET_256=Leap-16.0-online-installer-x86_64-Build1.3.install.iso.sha256 \
BUILD=1.3 \
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/Leap-16.0-online-installer-x86_64-Build1.3.install.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=opensuse \
FLAVOR=agama-installer-Leap \
FLAVOR=online-installer \
FULLURL=1 \
ISO=agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso \
ISO=Leap-16.0-online-installer-x86_64-Build1.3.install.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
Expand All @@ -42,13 +42,13 @@

/usr/bin/openqa-cli api -X post isos?async=1 \
ARCH=ppc64le \
ASSET_256=agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso.sha256 \
ASSET_256=Leap-16.0-online-installer-ppc64le-Build1.3.install.iso.sha256 \
BUILD=1.3 \
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/Leap-16.0-online-installer-ppc64le-Build1.3.install.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=opensuse \
FLAVOR=agama-installer-Leap \
FLAVOR=online-installer \
FULLURL=1 \
ISO=agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso \
ISO=Leap-16.0-online-installer-ppc64le-Build1.3.install.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
Expand All @@ -63,13 +63,13 @@

/usr/bin/openqa-cli api -X post isos?async=1 \
ARCH=s390x \
ASSET_256=agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso.sha256 \
ASSET_256=Leap-16.0-online-installer-s390x-Build1.3.install.iso.sha256 \
BUILD=1.3 \
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/Leap-16.0-online-installer-s390x-Build1.3.install.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=opensuse \
FLAVOR=agama-installer-Leap \
FLAVOR=online-installer \
FULLURL=1 \
ISO=agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso \
ISO=Leap-16.0-online-installer-s390x-Build1.3.install.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
Expand Down
16 changes: 8 additions & 8 deletions t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_iso.before
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso /var/lib/openqa/factory/iso/agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso.sha256
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso /var/lib/openqa/factory/iso/agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso.sha256
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso /var/lib/openqa/factory/iso/agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso.sha256
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso /var/lib/openqa/factory/iso/agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/*/*agama-installer-Leap*/*agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso.sha256 /var/lib/openqa/factory/other/agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso.sha256
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/../product/local/*leap_mini*/*Leap-16.0-online-installer-aarch64-Build1.3.install.iso /var/lib/openqa/factory/iso/Leap-16.0-online-installer-aarch64-Build1.3.install.iso
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/../product/local/*leap_mini*/*Leap-16.0-online-installer-aarch64-Build1.3.install.iso.sha256 /var/lib/openqa/factory/other/Leap-16.0-online-installer-aarch64-Build1.3.install.iso.sha256
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/../product/local/*leap_mini*/*Leap-16.0-online-installer-x86_64-Build1.3.install.iso /var/lib/openqa/factory/iso/Leap-16.0-online-installer-x86_64-Build1.3.install.iso
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/../product/local/*leap_mini*/*Leap-16.0-online-installer-x86_64-Build1.3.install.iso.sha256 /var/lib/openqa/factory/other/Leap-16.0-online-installer-x86_64-Build1.3.install.iso.sha256
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/../product/local/*leap_mini*/*Leap-16.0-online-installer-ppc64le-Build1.3.install.iso /var/lib/openqa/factory/iso/Leap-16.0-online-installer-ppc64le-Build1.3.install.iso
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/../product/local/*leap_mini*/*Leap-16.0-online-installer-ppc64le-Build1.3.install.iso.sha256 /var/lib/openqa/factory/other/Leap-16.0-online-installer-ppc64le-Build1.3.install.iso.sha256
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/../product/local/*leap_mini*/*Leap-16.0-online-installer-s390x-Build1.3.install.iso /var/lib/openqa/factory/iso/Leap-16.0-online-installer-s390x-Build1.3.install.iso
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/../product/local/*leap_mini*/*Leap-16.0-online-installer-s390x-Build1.3.install.iso.sha256 /var/lib/openqa/factory/other/Leap-16.0-online-installer-s390x-Build1.3.install.iso.sha256
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/../product/local/*leap_dvd5*/*Leap-16.0-offline-installer-aarch64-Build1.3.install.iso /var/lib/openqa/factory/iso/Leap-16.0-offline-installer-aarch64-Build1.3.install.iso
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/../product/local/*leap_dvd5*/*Leap-16.0-offline-installer-aarch64-Build1.3.install.iso.sha256 /var/lib/openqa/factory/other/Leap-16.0-offline-installer-aarch64-Build1.3.install.iso.sha256
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:16.0:ToTest/images/../product/local/*leap_dvd5*/*Leap-16.0-offline-installer-x86_64-Build1.3.install.iso /var/lib/openqa/factory/iso/Leap-16.0-offline-installer-x86_64-Build1.3.install.iso
Expand Down
3 changes: 2 additions & 1 deletion xml/obs/openSUSE:Leap:16.0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
repo_path="product/local"
distri="opensuse"
archs="aarch64 x86_64 ppc64le s390x">
<flavor name="agama-installer-Leap" folder="*/*agama-installer-Leap*" iso="1" media1="0">
<flavor name="online-installer" folder="../product/local" media1="0">
<repos>
<leap_oss mirror="1" multiarch="1" folder="*leap_oss/Leap-16.0-aarch64-ppc64le-s390x-x86_64/" debug="{java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*}"/>
</repos>
<iso filemask="online-installer" folder="../product/local/*leap_mini*"/>
</flavor>
<flavor name="offline-installer" folder="../product/local" media1="0">
<iso filemask="offline-installer" folder="../product/local/*leap_dvd5*"/>
Expand Down