From cf70d8aecc385e85d70e1e52019bfe3716ad87fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Fri, 24 Jan 2025 12:58:01 +0100 Subject: [PATCH] Fix box update issue The box images are built in OBS and fetched from the download server. The download server uses mirrors to manage the data. The mirror update is based on the filename of the data. The filename of the box files only changed when we updated the name or the version which is not necessarily the case when we fix bugs in the plugin code or when package updates in the distribution happens. Thus the mirror data was often old even though a fix was made. To prevent this issue I reactivated the build counter in the OBS projects building the box files, such that every rebuild of the image gets a new BuildXX number in the result files. This of course introduces a problem with the plugin configuration which needs to reference static file names. To solve this problem this commit moved to the static link names produced by OBS. --- .../config/kiwi_boxed_plugin.yml | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/kiwi_boxed_plugin/config/kiwi_boxed_plugin.yml b/kiwi_boxed_plugin/config/kiwi_boxed_plugin.yml index d80e635..76c0dcd 100644 --- a/kiwi_boxed_plugin/config/kiwi_boxed_plugin.yml +++ b/kiwi_boxed_plugin/config/kiwi_boxed_plugin.yml @@ -11,10 +11,10 @@ box: - root=/dev/vda3 - rd.plymouth=0 source: obs://Virtualization:Appliances:SelfContained:tumbleweed/images - packages_file: TumbleWeed-Box.x86_64-1.43.3-System-BuildBox.report + packages_file: TumbleWeed-Box.x86_64-System.json boxfiles: - - TumbleWeed-Box.x86_64-1.43.3-Kernel-BuildBox.tar.xz - - TumbleWeed-Box.x86_64-1.43.3-System-BuildBox.qcow2 + - TumbleWeed-Box.x86_64-Kernel.tar.xz + - TumbleWeed-Box.x86_64-System.qcow2 use_initrd: true - @@ -24,10 +24,10 @@ box: - rd.plymouth=0 - selinux=0 source: obs://Virtualization:Appliances:SelfContained:tumbleweed/images - packages_file: TumbleWeed-Box.x86_64-1.43.3-System-BuildBox.report + packages_file: TumbleWeed-Box.x86_64-System.json boxfiles: - - TumbleWeed-Box.x86_64-1.43.3-Kernel-BuildBox.tar.xz - - TumbleWeed-Box.x86_64-1.43.3-System-BuildBox.qcow2 + - TumbleWeed-Box.x86_64-Kernel.tar.xz + - TumbleWeed-Box.x86_64-System.qcow2 use_initrd: true - @@ -37,10 +37,10 @@ box: - rd.plymouth=0 - selinux=0 source: obs://Virtualization:Appliances:SelfContained:tumbleweed/images - packages_file: TumbleWeed-Box.s390x-1.43.3-System-BuildBox.report + packages_file: TumbleWeed-Box.s390x-System.json boxfiles: - - TumbleWeed-Box.s390x-1.43.3-Kernel-BuildBox.tar.xz - - TumbleWeed-Box.s390x-1.43.3-System-BuildBox.qcow2 + - TumbleWeed-Box.s390x-Kernel.tar.xz + - TumbleWeed-Box.s390x-System.qcow2 use_initrd: true - @@ -55,10 +55,10 @@ box: - root=/dev/vda1 - rd.plymouth=0 source: obs://Virtualization:Appliances:SelfContained:leap/images - packages_file: Leap-Box.x86_64-1.15.5-System-BuildBox.report + packages_file: Leap-Box.x86_64-System.json boxfiles: - - Leap-Box.x86_64-1.15.5-Kernel-BuildBox.tar.xz - - Leap-Box.x86_64-1.15.5-System-BuildBox.qcow2 + - Leap-Box.x86_64-Kernel.tar.xz + - Leap-Box.x86_64-System.qcow2 use_initrd: true - @@ -74,10 +74,10 @@ box: - rd.plymouth=0 - selinux=0 source: obs://Virtualization:Appliances:SelfContained:fedora/images - packages_file: Fedora-Box.x86_64-1.39.1-System-BuildBox.report + packages_file: Fedora-Box.x86_64-System.json boxfiles: - - Fedora-Box.x86_64-1.39.1-Kernel-BuildBox.tar.xz - - Fedora-Box.x86_64-1.39.1-System-BuildBox.qcow2 + - Fedora-Box.x86_64-Kernel.tar.xz + - Fedora-Box.x86_64-System.qcow2 use_initrd: true - @@ -93,10 +93,10 @@ box: - rd.plymouth=0 - selinux=0 source: obs://Virtualization:Appliances:SelfContained:ubuntu/images - packages_file: Ubuntu-Box.x86_64-1.24.4-System-BuildBox.report + packages_file: Ubuntu-Box.x86_64-System.json boxfiles: - - Ubuntu-Box.x86_64-1.24.4-Kernel-BuildBox.tar.xz - - Ubuntu-Box.x86_64-1.24.4-System-BuildBox.qcow2 + - Ubuntu-Box.x86_64-Kernel.tar.xz + - Ubuntu-Box.x86_64-System.qcow2 use_initrd: true - @@ -106,10 +106,10 @@ box: - rd.plymouth=0 - selinux=0 source: obs://Virtualization:Appliances:SelfContained:ubuntu/images - packages_file: Ubuntu-Box.aarch64-1.24.4-System-BuildBox.report + packages_file: Ubuntu-Box.aarch64-System.json boxfiles: - - Ubuntu-Box.aarch64-1.24.4-Kernel-BuildBox.tar.xz - - Ubuntu-Box.aarch64-1.24.4-System-BuildBox.qcow2 + - Ubuntu-Box.aarch64-Kernel.tar.xz + - Ubuntu-Box.aarch64-System.qcow2 use_initrd: true - @@ -125,10 +125,10 @@ box: - rd.plymouth=0 - selinux=0 source: obs://Virtualization:Appliances:SelfContained:universal/images - packages_file: Universal-Box.x86_64-1.41.2-System-BuildBox.report + packages_file: Universal-Box.x86_64-System.json boxfiles: - - Universal-Box.x86_64-1.41.2-Kernel-BuildBox.tar.xz - - Universal-Box.x86_64-1.41.2-System-BuildBox.qcow2 + - Universal-Box.x86_64-Kernel.tar.xz + - Universal-Box.x86_64-System.qcow2 use_initrd: true - @@ -138,10 +138,10 @@ box: - rd.plymouth=0 - selinux=0 source: obs://Virtualization:Appliances:SelfContained:universal/images - packages_file: Universal-Box.aarch64-1.41.2-System-BuildBox.report + packages_file: Universal-Box.aarch64-System.json boxfiles: - - Universal-Box.aarch64-1.41.2-Kernel-BuildBox.tar.xz - - Universal-Box.aarch64-1.41.2-System-BuildBox.qcow2 + - Universal-Box.aarch64-Kernel.tar.xz + - Universal-Box.aarch64-System.qcow2 use_initrd: true - @@ -151,10 +151,10 @@ box: - rd.plymouth=0 - selinux=0 source: obs://Virtualization:Appliances:SelfContained:universal/images - packages_file: Universal-Box.s390x-1.41.2-System-BuildBox.report + packages_file: Universal-Box.s390x-System.json boxfiles: - - Universal-Box.s390x-1.41.2-Kernel-BuildBox.tar.xz - - Universal-Box.s390x-1.41.2-System-BuildBox.qcow2 + - Universal-Box.s390x-Kernel.tar.xz + - Universal-Box.s390x-System.qcow2 use_initrd: true - @@ -164,8 +164,8 @@ box: - rd.plymouth=0 - selinux=0 source: obs://Virtualization:Appliances:SelfContained:universal/images - packages_file: Universal-Box.ppc64le-1.41.2-System-BuildBox.report + packages_file: Universal-Box.ppc64le-System.json boxfiles: - - Universal-Box.ppc64le-1.41.2-Kernel-BuildBox.tar.xz - - Universal-Box.ppc64le-1.41.2-System-BuildBox.qcow2 + - Universal-Box.ppc64le-Kernel.tar.xz + - Universal-Box.ppc64le-System.qcow2 use_initrd: true