Skip to content

Commit ea2029d

Browse files
lkocmanlkocman
authored
Merge pull request #276 from lkocman/leapmicro61
Micro 6.1: Fix format for encrypted images raw -> raw.xz
2 parents 1c31169 + a49f8e3 commit ea2029d

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

‎t/obs/openSUSE:Leap:Micro:6.1:ToTest/files_iso.lst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ openSUSE-Leap-Micro.aarch64-6.1-Default-Build13.1.raw.xz
22
openSUSE-Leap-Micro.x86_64-6.1-Default-Build13.1.raw.xz
33
openSUSE-Leap-Micro.aarch64-6.1-Default-SelfInstall-Build13.1.install.iso
44
openSUSE-Leap-Micro.x86_64-6.1-Default-SelfInstall-Build13.1.install.iso
5-
openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw
5+
openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw.xz
66
openSUSE-Leap-Micro.aarch64-6.1-Default-qcow-Build13.1.qcow2
77
openSUSE-Leap-Micro.x86_64-6.1-Default-qcow-Build13.1.qcow2
88
openSUSE-Leap-Micro.aarch64-6.1-Base-Build13.1.raw.xz
@@ -11,6 +11,6 @@ openSUSE-Leap-Micro.aarch64-6.1-Base-SelfInstall-Build13.1.install.iso
1111
openSUSE-Leap-Micro.x86_64-6.1-Base-SelfInstall-Build13.1.install.iso
1212
openSUSE-Leap-Micro.x86_64-6.1-Base-RT-Build13.1.raw.xz
1313
openSUSE-Leap-Micro.x86_64-6.1-Base-RT-SelfInstall-Build13.1.install.iso
14-
openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw
14+
openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw.xz
1515
openSUSE-Leap-Micro.aarch64-6.1-Base-qcow-Build13.1.qcow2
1616
openSUSE-Leap-Micro.x86_64-6.1-Base-qcow-Build13.1.qcow2

‎t/obs/openSUSE:Leap:Micro:6.1:ToTest/print_openqa.before‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444

4545
/usr/bin/openqa-cli api -X post isos?async=1 \
4646
ARCH=x86_64 \
47-
ASSET_256=openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw.sha256 \
47+
ASSET_256=openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw.xz.sha256 \
4848
BUILD=13.1 \
49-
CHECKSUM_HDD_1=$(cut -b-64 /var/lib/openqa/factory/other/openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
49+
CHECKSUM_HDD_1=$(cut -b-64 /var/lib/openqa/factory/other/openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw.xz.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
5050
DISTRI=leap-micro \
5151
FLAVOR=Default-encrypted \
52-
HDD_1=openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw \
52+
HDD_1=openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw.xz \
5353
VERSION=6.1 \
5454
_OBSOLETE=1
5555

@@ -143,12 +143,12 @@
143143

144144
/usr/bin/openqa-cli api -X post isos?async=1 \
145145
ARCH=x86_64 \
146-
ASSET_256=openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw.sha256 \
146+
ASSET_256=openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw.xz.sha256 \
147147
BUILD=13.1 \
148-
CHECKSUM_HDD_1=$(cut -b-64 /var/lib/openqa/factory/other/openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
148+
CHECKSUM_HDD_1=$(cut -b-64 /var/lib/openqa/factory/other/openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw.xz.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
149149
DISTRI=leap-micro \
150150
FLAVOR=Base-encrypted \
151-
HDD_1=openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw \
151+
HDD_1=openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw.xz \
152152
VERSION=6.1 \
153153
_OBSOLETE=1
154154

‎t/obs/openSUSE:Leap:Micro:6.1:ToTest/print_rsync_iso.before‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1
66
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Default-SelfInstall/*openSUSE-Leap-Micro.aarch64-6.1-Default-SelfInstall-Build13.1.install.iso.sha256 /var/lib/openqa/factory/other/openSUSE-Leap-Micro.aarch64-6.1-Default-SelfInstall-Build13.1.install.iso.sha256
77
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Default-SelfInstall/*openSUSE-Leap-Micro.x86_64-6.1-Default-SelfInstall-Build13.1.install.iso /var/lib/openqa/factory/iso/openSUSE-Leap-Micro.x86_64-6.1-Default-SelfInstall-Build13.1.install.iso
88
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Default-SelfInstall/*openSUSE-Leap-Micro.x86_64-6.1-Default-SelfInstall-Build13.1.install.iso.sha256 /var/lib/openqa/factory/other/openSUSE-Leap-Micro.x86_64-6.1-Default-SelfInstall-Build13.1.install.iso.sha256
9-
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Default-encrypted/*openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw /var/lib/openqa/factory/hdd/openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw
10-
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Default-encrypted/*openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw.sha256 /var/lib/openqa/factory/other/openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw.sha256
9+
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Default-encrypted/*openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw.xz /var/lib/openqa/factory/hdd/openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw.xz
10+
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Default-encrypted/*openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw.xz.sha256 /var/lib/openqa/factory/other/openSUSE-Leap-Micro.x86_64-6.1-Default-encrypted-Build13.1.raw.xz.sha256
1111
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Default-qcow/*openSUSE-Leap-Micro.aarch64-6.1-Default-qcow-Build13.1.qcow2 /var/lib/openqa/factory/hdd/openSUSE-Leap-Micro.aarch64-6.1-Default-qcow-Build13.1.qcow2
1212
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Default-qcow/*openSUSE-Leap-Micro.aarch64-6.1-Default-qcow-Build13.1.qcow2.sha256 /var/lib/openqa/factory/other/openSUSE-Leap-Micro.aarch64-6.1-Default-qcow-Build13.1.qcow2.sha256
1313
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Default-qcow/*openSUSE-Leap-Micro.x86_64-6.1-Default-qcow-Build13.1.qcow2 /var/lib/openqa/factory/hdd/openSUSE-Leap-Micro.x86_64-6.1-Default-qcow-Build13.1.qcow2
@@ -24,8 +24,8 @@ rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1
2424
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Base-RT/*openSUSE-Leap-Micro.x86_64-6.1-Base-RT-Build13.1.raw.xz.sha256 /var/lib/openqa/factory/other/openSUSE-Leap-Micro.x86_64-6.1-Base-RT-Build13.1.raw.xz.sha256
2525
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Base-RT-SelfInstall/*openSUSE-Leap-Micro.x86_64-6.1-Base-RT-SelfInstall-Build13.1.install.iso /var/lib/openqa/factory/iso/openSUSE-Leap-Micro.x86_64-6.1-Base-RT-SelfInstall-Build13.1.install.iso
2626
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Base-RT-SelfInstall/*openSUSE-Leap-Micro.x86_64-6.1-Base-RT-SelfInstall-Build13.1.install.iso.sha256 /var/lib/openqa/factory/other/openSUSE-Leap-Micro.x86_64-6.1-Base-RT-SelfInstall-Build13.1.install.iso.sha256
27-
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Base-encrypted/*openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw /var/lib/openqa/factory/hdd/openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw
28-
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Base-encrypted/*openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw.sha256 /var/lib/openqa/factory/other/openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw.sha256
27+
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Base-encrypted/*openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw.xz /var/lib/openqa/factory/hdd/openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw.xz
28+
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Base-encrypted/*openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw.xz.sha256 /var/lib/openqa/factory/other/openSUSE-Leap-Micro.x86_64-6.1-Base-encrypted-Build13.1.raw.xz.sha256
2929
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Base-qcow/*openSUSE-Leap-Micro.aarch64-6.1-Base-qcow-Build13.1.qcow2 /var/lib/openqa/factory/hdd/openSUSE-Leap-Micro.aarch64-6.1-Base-qcow-Build13.1.qcow2
3030
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Base-qcow/*openSUSE-Leap-Micro.aarch64-6.1-Base-qcow-Build13.1.qcow2.sha256 /var/lib/openqa/factory/other/openSUSE-Leap-Micro.aarch64-6.1-Base-qcow-Build13.1.qcow2.sha256
3131
rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Leap:Micro:6.1:ToTest/images/*/Leap-Micro:Base-qcow/*openSUSE-Leap-Micro.x86_64-6.1-Base-qcow-Build13.1.qcow2 /var/lib/openqa/factory/hdd/openSUSE-Leap-Micro.x86_64-6.1-Base-qcow-Build13.1.qcow2

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<hdd filemask="openSUSE-Leap-Micro.*-Default-SelfInstall-Build.*\.iso$"/>
1111
</flavor>
1212
<flavor name="Default-encrypted" folder="*/Leap-Micro:Default-encrypted">
13-
<hdd filemask="openSUSE-Leap-Micro.*-Default-encrypted-Build.*\.raw$"/>
13+
<hdd filemask="openSUSE-Leap-Micro.*-Default-encrypted-Build.*\.raw.xz$"/>
1414
</flavor>
1515
<flavor name="Default-qcow" folder="*/Leap-Micro:Default-qcow">
1616
<hdd filemask="openSUSE-Leap-Micro.*-Default-qcow-Build.*\.qcow2$"/>
@@ -28,7 +28,7 @@
2828
<hdd filemask="openSUSE-Leap-Micro.*-Base-RT-SelfInstall-Build.*\.iso$"/>
2929
</flavor>
3030
<flavor name="Base-encrypted" folder="*/Leap-Micro:Base-encrypted">
31-
<hdd filemask="openSUSE-Leap-Micro.*-Base-encrypted-Build.*\.raw$"/>
31+
<hdd filemask="openSUSE-Leap-Micro.*-Base-encrypted-Build.*\.raw.xz$"/>
3232
</flavor>
3333
<flavor name="Base-qcow" folder="*/Leap-Micro:Base-qcow">
3434
<hdd filemask="openSUSE-Leap-Micro.*-Base-qcow-Build.*\.qcow2$"/>

0 commit comments

Comments
 (0)