Skip to content

Commit

Permalink
Use iso instead of hdd; remove asterics from folder
Browse files Browse the repository at this point in the history
  • Loading branch information
andrii-suse committed May 2, 2023
1 parent 25ca914 commit 6b72825
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 44 deletions.
2 changes: 1 addition & 1 deletion t/obs/SUSE:ALP:Products:Installer:0.8/files_iso.lst
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
d-installer-live.x86_64-0.8.3-ALP-Build11.1.iso
d-installer-live.s390x-0.8.3-ALP-Build11.1.iso
d-installer-live.s390x-0.8.3-ALP-Build11.1.iso
d-installer-live.aarch64-0.8.3-ALP-Build11.1.iso
49 changes: 25 additions & 24 deletions t/obs/SUSE:ALP:Products:Installer:0.8/print_openqa.before
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,33 @@
FLAVOR=d-installer-live \
FULLURL=1 \
ISO=d-installer-live.x86_64-0.8.3-ALP-Build11.1.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/ALP-Installer-0.8-x86_64-Build11.1 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/ALP-Installer-0.8-x86_64-Build11.1 \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/ALP-Installer-0.8.3-x86_64-Build11.1 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/ALP-Installer-0.8.3-x86_64-Build11.1 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
REPO_0=ALP-Installer-0.8-x86_64-Build11.1 \
REPO_1=ALP-Installer-0.8-x86_64.license-Build11.1 \
REPO_ALP=ALP-Installer-0.8-x86_64-Build11.1 \
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/ALP-Installer-0.8-x86_64-Build11.1 \
VERSION=d-installer-live \
REPO_0=ALP-Installer-0.8.3-x86_64-Build11.1 \
REPO_1=ALP-Installer-0.8.3-x86_64.license-Build11.1 \
REPO_ALP=ALP-Installer-0.8.3-x86_64-Build11.1 \
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/ALP-Installer-0.8.3-x86_64-Build11.1 \
VERSION=Installer-0.8 \
_OBSOLETE=1

/usr/bin/openqa-cli api -X post isos?async=1 \
ARCH=s390x \
ASSET_256=d-installer-live.s390x-0.8.3-ALP-Build11.1.iso.sha256 \
ASSET_256=d-installer-live.s390x-0.8.3-ALP-Build11.1.iso .sha256 \
BUILD=11.1 \
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/d-installer-live.s390x-0.8.3-ALP-Build11.1.iso.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
CHECKSUM_ISO=$(cut -b-64 /var/lib/openqa/factory/other/d-installer-live.s390x-0.8.3-ALP-Build11.1.iso .sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
DISTRI=alp \
FLAVOR=d-installer-live \
FULLURL=1 \
ISO=d-installer-live.s390x-0.8.3-ALP-Build11.1.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/ALP-Installer-0.8-s390x-Build11.1 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/ALP-Installer-0.8-s390x-Build11.1 \
ISO=d-installer-live.s390x-0.8.3-ALP-Build11.1.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/ALP-Installer-0.8.3-s390x-Build11.1 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/ALP-Installer-0.8.3-s390x-Build11.1 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
REPO_0=ALP-Installer-0.8-s390x-Build11.1 \
REPO_1=ALP-Installer-0.8-s390x.license-Build11.1 \
REPO_ALP=ALP-Installer-0.8-s390x-Build11.1 \
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/ALP-Installer-0.8-s390x-Build11.1 \
VERSION=d-installer-live \
REPO_0=ALP-Installer-0.8.3-s390x-Build11.1 \
REPO_1=ALP-Installer-0.8.3-s390x.license-Build11.1 \
REPO_ALP=ALP-Installer-0.8.3-s390x-Build11.1 \
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/ALP-Installer-0.8.3-s390x-Build11.1 \
VERSION=Installer-0.8 \
_OBSOLETE=1

/usr/bin/openqa-cli api -X post isos?async=1 \
Expand All @@ -45,12 +45,13 @@
FLAVOR=d-installer-live \
FULLURL=1 \
ISO=d-installer-live.aarch64-0.8.3-ALP-Build11.1.iso \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/ALP-Installer-0.8-aarch64-Build11.1 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/ALP-Installer-0.8-aarch64-Build11.1 \
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/ALP-Installer-0.8.3-aarch64-Build11.1 \
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/ALP-Installer-0.8.3-aarch64-Build11.1 \
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
REPO_0=ALP-Installer-0.8-aarch64-Build11.1 \
REPO_1=ALP-Installer-0.8-aarch64.license-Build11.1 \
REPO_ALP=ALP-Installer-0.8-aarch64-Build11.1 \
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/ALP-Installer-0.8-aarch64-Build11.1 \
VERSION=d-installer-live \
REPO_0=ALP-Installer-0.8.3-aarch64-Build11.1 \
REPO_1=ALP-Installer-0.8.3-aarch64.license-Build11.1 \
REPO_ALP=ALP-Installer-0.8.3-aarch64-Build11.1 \
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/ALP-Installer-0.8.3-aarch64-Build11.1 \
VERSION=Installer-0.8 \
_OBSOLETE=1

12 changes: 6 additions & 6 deletions t/obs/SUSE:ALP:Products:Installer:0.8/print_rsync_iso.before
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//images/*/ALP-Installer:d-installer-live:ALP/*d-installer-live.x86_64-0.8.3-ALP-Build11.1.iso /var/lib/openqa/factory/hdd/d-installer-live.x86_64-0.8.3-ALP-Build11.1.iso
rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//images/*/ALP-Installer:d-installer-live:ALP/*d-installer-live.x86_64-0.8.3-ALP-Build11.1.iso.sha256 /var/lib/openqa/factory/other/d-installer-live.x86_64-0.8.3-ALP-Build11.1.iso.sha256
rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//images/*/ALP-Installer:d-installer-live:ALP/*d-installer-live.s390x-0.8.3-ALP-Build11.1.iso /var/lib/openqa/factory/hdd/d-installer-live.s390x-0.8.3-ALP-Build11.1.iso
rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//images/*/ALP-Installer:d-installer-live:ALP/*d-installer-live.s390x-0.8.3-ALP-Build11.1.iso.sha256 /var/lib/openqa/factory/other/d-installer-live.s390x-0.8.3-ALP-Build11.1.iso.sha256
rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//images/*/ALP-Installer:d-installer-live:ALP/*d-installer-live.aarch64-0.8.3-ALP-Build11.1.iso /var/lib/openqa/factory/hdd/d-installer-live.aarch64-0.8.3-ALP-Build11.1.iso
rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//images/*/ALP-Installer:d-installer-live:ALP/*d-installer-live.aarch64-0.8.3-ALP-Build11.1.iso.sha256 /var/lib/openqa/factory/other/d-installer-live.aarch64-0.8.3-ALP-Build11.1.iso.sha256`
rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//images/*/ALP-Installer:d-installer-live/*d-installer-live.x86_64-0.8.3-ALP-Build11.1.iso /var/lib/openqa/factory/iso/d-installer-live.x86_64-0.8.3-ALP-Build11.1.iso
rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//images/*/ALP-Installer:d-installer-live/*d-installer-live.x86_64-0.8.3-ALP-Build11.1.iso.sha256 /var/lib/openqa/factory/other/d-installer-live.x86_64-0.8.3-ALP-Build11.1.iso.sha256
rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//images/*/ALP-Installer:d-installer-live/*d-installer-live.s390x-0.8.3-ALP-Build11.1.iso /var/lib/openqa/factory/other/d-installer-live.s390x-0.8.3-ALP-Build11.1.iso
rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//images/*/ALP-Installer:d-installer-live/*d-installer-live.s390x-0.8.3-ALP-Build11.1.iso .sha256 /var/lib/openqa/factory/other/d-installer-live.s390x-0.8.3-ALP-Build11.1.iso .sha256
rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//images/*/ALP-Installer:d-installer-live/*d-installer-live.aarch64-0.8.3-ALP-Build11.1.iso /var/lib/openqa/factory/iso/d-installer-live.aarch64-0.8.3-ALP-Build11.1.iso
rsync --timeout=3600 -tlp4 --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//images/*/ALP-Installer:d-installer-live/*d-installer-live.aarch64-0.8.3-ALP-Build11.1.iso.sha256 /var/lib/openqa/factory/other/d-installer-live.aarch64-0.8.3-ALP-Build11.1.iso.sha256
19 changes: 9 additions & 10 deletions t/obs/SUSE:ALP:Products:Installer:0.8/print_rsync_repo.before
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//*images/local/000product:ALP-Installer-ftp-POOL**x86_64*/*Media1/* /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-x86_64.license-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//*images/local/000product:ALP-Installer-ftp-POOL*x86_64*/*Media1/* /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-x86_64.license-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-x86_64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-x86_64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-x86_64.license-Build11.1
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//*images/local/000product:ALP-Installer-ftp-POOL**x86_64*/*Media1/* /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-x86_64-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//*images/local/000product:ALP-Installer-ftp-POOL*x86_64*/*Media1/* /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-x86_64-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-x86_64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-x86_64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-x86_64-Build11.1
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//*images/local/000product:ALP-Installer-ftp-POOL**aarch64*/*Media1/* /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-aarch64.license-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-aarch64.license-Build11.1
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//*images/local/000product:ALP-Installer-ftp-POOL**aarch64*/*Media1/* /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-aarch64-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Installer-0.8-aarch64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8-aarch64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8-aarch64-Build11.1
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//*images/local/000product:ALP-Installer-ftp-POOL**s390x*/*Media1/* /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-s390x.license-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//*images/local/000product:ALP-Installer-ftp-POOL*s390x*/*Media1/* /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-s390x.license-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-s390x.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-s390x.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-s390x.license-Build11.1
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//*images/local/000product:ALP-Installer-ftp-POOL**s390x*/*Media1/* /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-s390x-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Installer-0.8-s390x-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8-s390x-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8-s390x-Build11.1

rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//*images/local/000product:ALP-Installer-ftp-POOL*s390x*/*Media1/* /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-s390x-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-s390x-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-s390x-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-s390x-Build11.1
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//*images/local/000product:ALP-Installer-ftp-POOL*aarch64*/*Media1/* /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-aarch64.license-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-aarch64.license-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-aarch64.license-Build11.1
rsync --timeout=3600 -rtlp4 --delete --specials obspublish-other::openqa/SUSE:ALP:Products:Installer:0.8//*images/local/000product:ALP-Installer-ftp-POOL*aarch64*/*Media1/* /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-aarch64-CURRENT/
rsync --timeout=3600 -rtlp4 --delete --specials --link-dest /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-aarch64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-aarch64-CURRENT/ /var/lib/openqa/factory/repo/ALP-Installer-0.8.3-aarch64-Build11.1
5 changes: 2 additions & 3 deletions xml/obs/SUSE:ALP:Installer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
distri="alp"
version="Installer-0.8"
archs="x86_64 s390x aarch64">
<flavor name="d-installer-live" folder="images/*/ALP-Installer:d-installer-live">
<hdd filemask="ALP-Installer.*d-installer-live-Build.*\.iso$"/>
<flavor name="d-installer-live" folder="images/*/ALP-Installer:d-installer-live" iso="1">
<repos>
<ALP folder="images/local/000product:ALP-Installer-ftp-POOL*" mirror="1"/>
<ALP folder="images/local/000product:ALP-Installer-ftp-POOL" mirror="1"/>
</repos>
</flavor>
</openQA>
Expand Down

0 comments on commit 6b72825

Please sign in to comment.