commit obs-service-kiwi_metainfo_helper for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package obs-service-kiwi_metainfo_helper for 
openSUSE:Factory checked in at 2024-06-07 15:01:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-kiwi_metainfo_helper (Old)
 and      
/work/SRC/openSUSE:Factory/.obs-service-kiwi_metainfo_helper.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "obs-service-kiwi_metainfo_helper"

Fri Jun  7 15:01:57 2024 rev:17 rq:1179158 version:0.6

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/obs-service-kiwi_metainfo_helper/obs-service-kiwi_metainfo_helper.changes
        2024-02-07 18:48:19.998533185 +0100
+++ 
/work/SRC/openSUSE:Factory/.obs-service-kiwi_metainfo_helper.new.24587/obs-service-kiwi_metainfo_helper.changes
     2024-06-07 15:02:05.360980592 +0200
@@ -1,0 +2,5 @@
+Fri Jun  7 08:35:33 UTC 2024 - Andrea Mazzotti <andrea.mazzo...@suse.com>
+
+- Support Docker.FLAVOR in _multibuild (boo#1226010)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kiwi_metainfo_helper ++++++
--- /var/tmp/diff_new_pack.0zsyqt/_old  2024-06-07 15:02:06.169010029 +0200
+++ /var/tmp/diff_new_pack.0zsyqt/_new  2024-06-07 15:02:06.173010174 +0200
@@ -16,8 +16,8 @@
        # The build script renames the recipe (to strip _service:foo:), but 
doesn't update .data
        RECIPEFILE="${RECIPEFILE##*:}"
 
-       if [ "${RECIPEFILE##*.}" != "kiwi" ] && [ "${RECIPEFILE}" != 
"Dockerfile" ] && [ "${RECIPEFILE}" != "Chart.yaml" ]; then
-               echo "Recipe is neither Dockerfile, kiwi recipe nor helm chart 
- exiting"
+       if [ "${RECIPEFILE##*.}" != "kiwi" ] && [[ ! "${RECIPEFILE}" =~ 
^Dockerfile.* ]] && [ "${RECIPEFILE}" != "Chart.yaml" ]; then
+               echo "Recipe ${RECIPEFILE} is neither Dockerfile, kiwi recipe 
nor helm chart - exiting"
                exit 0
        fi
 

++++++ test.sh ++++++
--- /var/tmp/diff_new_pack.0zsyqt/_old  2024-06-07 15:02:06.213011632 +0200
+++ /var/tmp/diff_new_pack.0zsyqt/_new  2024-06-07 15:02:06.217011778 +0200
@@ -85,6 +85,46 @@
 
SOURCEURL=https://sources.suse.com/SUSE:SLE-15-SP3:Update:CR/sles15-image/5f0a221b7877396cbf977205e64690d2/
 EOF
 
+# Test _multibuild
+cat >.data <<EOF
+DISTURL="obs://build.opensuse.org/openSUSE:Factory/images/0f40c57dd619e1dff9e512949b6bca09-opensuse-tumbleweed-image:docker"
+RELEASE=4.2
+RELEASE=4.2
+RECIPEFILE=_service:foobar:Dockerfile.FLAVOR
+BUILD_ARCH=aarch64:aarch64_ilp32:armv8l
+EOF
+export BUILD_DIST=.dist
+
+cat >Dockerfile.FLAVOR <<EOF
+RELEASE=%RELEASE%
+EOF
+
+bash "${script}"
+
+diff -u Dockerfile.FLAVOR - <<EOF
+RELEASE=4.2
+EOF
+
+# Test _multibuild when not a Dockerfile
+cat >.data <<EOF
+DISTURL="obs://build.opensuse.org/openSUSE:Factory/images/0f40c57dd619e1dff9e512949b6bca09-opensuse-tumbleweed-image:docker"
+RELEASE=4.2
+RELEASE=4.2
+RECIPEFILE=_service:foobar:NotADockerfile
+BUILD_ARCH=aarch64:aarch64_ilp32:armv8l
+EOF
+export BUILD_DIST=.dist
+
+cat >NotADockerfile <<EOF
+RELEASE=%RELEASE%
+EOF
+
+bash "${script}"
+
+diff -u NotADockerfile - <<EOF
+RELEASE=%RELEASE%
+EOF
+
 # Now test without build data (osc chroot build) and that without %OS_*% it 
doesn't need a release RPM
 rm -r ./.data ./repos/
 
@@ -105,4 +145,5 @@
 BUILDTIME=2018-10-30T09:19:02.074934628Z
 ARCH=noarch
 EOF
+(No newline at EOF)