openSUSE:Factory: Add JeOS-for-kvm-and-xen-sdboot flavor

rbmarliere · rbmarliere · commit eb61f9926c36 · 2024-12-12T13:16:15.000-03:00
diff --git a/t/obs/openSUSE:Factory:ToTest/jeos/files_iso.lst b/t/obs/openSUSE:Factory:ToTest/jeos/files_iso.lst
@@ -1,2 +1,3 @@
-openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20240603.qcow2
-openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20240603.qcow2
+openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20241211.qcow2
+openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-sdboot-Snapshot20241211.qcow2
+openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20241211.qcow2
diff --git a/t/obs/openSUSE:Factory:ToTest/jeos/print_openqa.before b/t/obs/openSUSE:Factory:ToTest/jeos/print_openqa.before
@@ -1,54 +1,81 @@
 /usr/bin/openqa-cli api -X post isos?async=1 \
  ARCH=x86_64 \
- ASSET_256=openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20240603.qcow2.sha256 \
- BUILD=20240603 \
- CHECKSUM_HDD_1=$(cut -b-64 /var/lib/openqa/factory/other/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20240603.qcow2.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
+ ASSET_256=openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20241211.qcow2.sha256 \
+ BUILD=20241211 \
+ CHECKSUM_HDD_1=$(cut -b-64 /var/lib/openqa/factory/other/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20241211.qcow2.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
  DISTRI=opensuse \
  FLAVOR=JeOS-for-kvm-and-xen \
  FULLURL=1 \
- HDD_1=openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20240603.qcow2 \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603 \
+ HDD_1=openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20241211.qcow2 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603 \
- REPO_1=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20240603 \
- REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603-debuginfo \
- REPO_3=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603-source \
- REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240603 \
- REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240603 \
- REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603-debuginfo \
+ REPO_0=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
+ REPO_1=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20241211 \
+ REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211-debuginfo \
+ REPO_3=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211-source \
+ REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20241211 \
+ REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20241211 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
+ REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211-debuginfo \
  REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603-source \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211-source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*,yast2-http-server*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
 /usr/bin/openqa-cli api -X post isos?async=1 \
  ARCH=x86_64 \
- ASSET_256=openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20240603.qcow2.sha256 \
- BUILD=20240603 \
- CHECKSUM_HDD_1=$(cut -b-64 /var/lib/openqa/factory/other/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20240603.qcow2.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
+ ASSET_256=openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-sdboot-Snapshot20241211.qcow2.sha256 \
+ BUILD=20241211 \
+ CHECKSUM_HDD_1=$(cut -b-64 /var/lib/openqa/factory/other/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-sdboot-Snapshot20241211.qcow2.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
+ DISTRI=opensuse \
+ FLAVOR=JeOS-for-kvm-and-xen-sdboot \
+ FULLURL=1 \
+ HDD_1=openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-sdboot-Snapshot20241211.qcow2 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
+ MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
+ REPO_0=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
+ REPO_1=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20241211 \
+ REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211-debuginfo \
+ REPO_3=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211-source \
+ REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20241211 \
+ REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20241211 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
+ REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211-debuginfo \
+ REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211-source \
+ REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*,yast2-http-server*' \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
+ VERSION=Tumbleweed \
+ _OBSOLETE=1
+
+/usr/bin/openqa-cli api -X post isos?async=1 \
+ ARCH=x86_64 \
+ ASSET_256=openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20241211.qcow2.sha256 \
+ BUILD=20241211 \
+ CHECKSUM_HDD_1=$(cut -b-64 /var/lib/openqa/factory/other/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20241211.qcow2.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \
  DISTRI=opensuse \
  FLAVOR=JeOS-for-OpenStack-Cloud \
  FULLURL=1 \
- HDD_1=openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20240603.qcow2 \
- MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603 \
- MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603 \
+ HDD_1=openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20241211.qcow2 \
+ MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
+ MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
  MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \
- REPO_0=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603 \
- REPO_1=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20240603 \
- REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603-debuginfo \
- REPO_3=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603-source \
- REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240603 \
- REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20240603 \
- REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603 \
- REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603-debuginfo \
+ REPO_0=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
+ REPO_1=openSUSE-Tumbleweed-oss-x86_64.license-Snapshot20241211 \
+ REPO_2=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211-debuginfo \
+ REPO_3=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211-source \
+ REPO_4=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20241211 \
+ REPO_NON_OSS=openSUSE-Tumbleweed-non-oss-x86_64-Snapshot20241211 \
+ REPO_OSS=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
+ REPO_OSS_DEBUGINFO=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211-debuginfo \
  REPO_OSS_DEBUGINFO_PACKAGES='java*,kernel-default-debug*,kernel-default-base-debug*,mraa-debug*,wicked-debug*' \
- REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603-source \
+ REPO_OSS_SOURCE=openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211-source \
  REPO_OSS_SOURCE_PACKAGES='coreutils*,yast2-network*,yast2-http-server*' \
- SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20240603 \
+ SUSEMIRROR=http://openqa.opensuse.org/assets/repo/openSUSE-Tumbleweed-oss-x86_64-Snapshot20241211 \
  VERSION=Tumbleweed \
  _OBSOLETE=1
 
diff --git a/t/obs/openSUSE:Factory:ToTest/jeos/print_rsync_iso.before b/t/obs/openSUSE:Factory:ToTest/jeos/print_rsync_iso.before
@@ -1,4 +1,6 @@
-rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Factory:ToTest/appliances/x86_64/kiwi-templates-Minimal:kvm-and-xen/*openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20240603.qcow2 /var/lib/openqa/factory/hdd/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20240603.qcow2
-rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Factory:ToTest/appliances/x86_64/kiwi-templates-Minimal:kvm-and-xen/*openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20240603.qcow2.sha256 /var/lib/openqa/factory/other/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20240603.qcow2.sha256
-rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Factory:ToTest/appliances/x86_64/kiwi-templates-Minimal:Cloud/*openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20240603.qcow2 /var/lib/openqa/factory/hdd/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20240603.qcow2
-rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Factory:ToTest/appliances/x86_64/kiwi-templates-Minimal:Cloud/*openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20240603.qcow2.sha256 /var/lib/openqa/factory/other/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20240603.qcow2.sha256
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Factory:ToTest/appliances/x86_64/kiwi-templates-Minimal:kvm-and-xen/*openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20241211.qcow2 /var/lib/openqa/factory/hdd/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20241211.qcow2
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Factory:ToTest/appliances/x86_64/kiwi-templates-Minimal:kvm-and-xen/*openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20241211.qcow2.sha256 /var/lib/openqa/factory/other/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-Snapshot20241211.qcow2.sha256
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Factory:ToTest/appliances/x86_64/kiwi-templates-Minimal:kvm-and-xen-sdboot/*openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-sdboot-Snapshot20241211.qcow2 /var/lib/openqa/factory/hdd/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-sdboot-Snapshot20241211.qcow2
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Factory:ToTest/appliances/x86_64/kiwi-templates-Minimal:kvm-and-xen-sdboot/*openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-sdboot-Snapshot20241211.qcow2.sha256 /var/lib/openqa/factory/other/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-kvm-and-xen-sdboot-Snapshot20241211.qcow2.sha256
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Factory:ToTest/appliances/x86_64/kiwi-templates-Minimal:Cloud/*openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20241211.qcow2 /var/lib/openqa/factory/hdd/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20241211.qcow2
+rsync --timeout=3600 -tlp4 --specials obspublish::openqa/openSUSE:Factory:ToTest/appliances/x86_64/kiwi-templates-Minimal:Cloud/*openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20241211.qcow2.sha256 /var/lib/openqa/factory/other/openSUSE-Tumbleweed-Minimal-VM.x86_64-1.0.0-Cloud-Snapshot20241211.qcow2.sha256
diff --git a/xml/obs/openSUSE:Factory.xml b/xml/obs/openSUSE:Factory.xml
@@ -24,6 +24,9 @@
         <flavor name="JeOS-for-kvm-and-xen" folder="kiwi-templates-Minimal:kvm-and-xen">
             <hdd filemask=".*kvm-and-xen.*\.qcow2$"/>
         </flavor>
+	<flavor name="JeOS-for-kvm-and-xen-sdboot" folder="kiwi-templates-Minimal:kvm-and-xen-sdboot">
+            <hdd filemask=".*kvm-and-xen-sdboot.*\.qcow2$"/>
+        </flavor>
 	<flavor name="JeOS-for-OpenStack-Cloud" folder="kiwi-templates-Minimal:Cloud">
             <hdd filemask=".*Minimal-VM.*-Cloud-.*\.qcow2$"/>
         </flavor>
