Skip to content

Commit d4cc305

Browse files
lkocmanlkocman
authored
Merge pull request #300 from nilxam/leap_16_product_reorg
Re-org iso list for Leap 16.0
2 parents 576b300 + 8e0b40e commit d4cc305

File tree

5 files changed

+31
-25
lines changed

5 files changed

+31
-25
lines changed

‎script/cfg.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ def pre_rsync_repo(repos):
119119
[ ! -f __envsub/files_repo.lst ] || ! grep -q -- "-POOL-" __envsub/files_repo.lst || additional_repo_suffix=-POOL
120120
[ -n "$buildid" ] || buildid=$(grep -hEo 'Build[0-9]+(.[0-9]+)?' __envsub/Media1_*.lst 2>/dev/null | head -n 1)
121121
122+
buildid=${buildid/.install}
122123
buildid=${buildid/.iso}
123124
'''
124125

‎t/obs/openSUSE:Leap:16.0:ToTest/files_iso.lst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ Leap-16.0-offline-installer-aarch64-Build1.3.install.iso
88
Leap-16.0-offline-installer-ppc64le-Build1.3.install.iso
99
Leap-16.0-offline-installer-s390x-Build1.3.install.iso
1010
Leap-16.0-offline-installer-x86_64-Build1.3.install.iso
11+
Leap-16.0-online-installer-aarch64-Build1.3.install.iso
12+
Leap-16.0-online-installer-ppc64le-Build1.3.install.iso
13+
Leap-16.0-online-installer-s390x-Build1.3.install.iso
14+
Leap-16.0-online-installer-x86_64-Build1.3.install.iso

‎t/obs/openSUSE:Leap:16.0:ToTest/print_openqa.before‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/usr/bin/openqa-cli api -X post isos?async=1 \
22
ARCH=aarch64 \
3-
ASSET_256=agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso.sha256 \
3+
ASSET_256=Leap-16.0-online-installer-aarch64-Build1.3.install.iso.sha256 \
44
BUILD=1.3 \
5-
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) \
5+
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) \
66
DISTRI=opensuse \
7-
FLAVOR=agama-installer-Leap \
7+
FLAVOR=online-installer \
88
FULLURL=1 \
9-
ISO=agama-installer-Leap.aarch64-16.0.0-Leap-Build1.3.iso \
9+
ISO=Leap-16.0-online-installer-aarch64-Build1.3.install.iso \
1010
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
1111
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
1212
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
@@ -21,13 +21,13 @@
2121

2222
/usr/bin/openqa-cli api -X post isos?async=1 \
2323
ARCH=x86_64 \
24-
ASSET_256=agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso.sha256 \
24+
ASSET_256=Leap-16.0-online-installer-x86_64-Build1.3.install.iso.sha256 \
2525
BUILD=1.3 \
26-
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) \
26+
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) \
2727
DISTRI=opensuse \
28-
FLAVOR=agama-installer-Leap \
28+
FLAVOR=online-installer \
2929
FULLURL=1 \
30-
ISO=agama-installer-Leap.x86_64-16.0.0-Leap-Build1.3.iso \
30+
ISO=Leap-16.0-online-installer-x86_64-Build1.3.install.iso \
3131
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
3232
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
3333
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
@@ -42,13 +42,13 @@
4242

4343
/usr/bin/openqa-cli api -X post isos?async=1 \
4444
ARCH=ppc64le \
45-
ASSET_256=agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso.sha256 \
45+
ASSET_256=Leap-16.0-online-installer-ppc64le-Build1.3.install.iso.sha256 \
4646
BUILD=1.3 \
47-
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) \
47+
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) \
4848
DISTRI=opensuse \
49-
FLAVOR=agama-installer-Leap \
49+
FLAVOR=online-installer \
5050
FULLURL=1 \
51-
ISO=agama-installer-Leap.ppc64le-16.0.0-Leap-Build1.3.iso \
51+
ISO=Leap-16.0-online-installer-ppc64le-Build1.3.install.iso \
5252
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
5353
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
5454
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
@@ -63,13 +63,13 @@
6363

6464
/usr/bin/openqa-cli api -X post isos?async=1 \
6565
ARCH=s390x \
66-
ASSET_256=agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso.sha256 \
66+
ASSET_256=Leap-16.0-online-installer-s390x-Build1.3.install.iso.sha256 \
6767
BUILD=1.3 \
68-
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) \
68+
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) \
6969
DISTRI=opensuse \
70-
FLAVOR=agama-installer-Leap \
70+
FLAVOR=online-installer \
7171
FULLURL=1 \
72-
ISO=agama-installer-Leap.s390x-16.0.0-Leap-Build1.3.iso \
72+
ISO=Leap-16.0-online-installer-s390x-Build1.3.install.iso \
7373
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
7474
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/Leap-16.0-aarch64-ppc64le-s390x-x86_64-Build1.3 \
7575
MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \

‎t/obs/openSUSE:Leap:16.0:ToTest/print_rsync_iso.before‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
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
2-
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
3-
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
4-
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
5-
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
6-
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
7-
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
8-
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
1+
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
2+
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
3+
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
4+
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
5+
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
6+
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
7+
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
8+
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
99
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
1010
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
1111
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

‎xml/obs/openSUSE:Leap:16.0.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
repo_path="product/local"
55
distri="opensuse"
66
archs="aarch64 x86_64 ppc64le s390x">
7-
<flavor name="agama-installer-Leap" folder="*/*agama-installer-Leap*" iso="1" media1="0">
7+
<flavor name="online-installer" folder="../product/local" media1="0">
88
<repos>
99
<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*}"/>
1010
</repos>
11+
<iso filemask="online-installer" folder="../product/local/*leap_mini*"/>
1112
</flavor>
1213
<flavor name="offline-installer" folder="../product/local" media1="0">
1314
<iso filemask="offline-installer" folder="../product/local/*leap_dvd5*"/>

0 commit comments

Comments
 (0)