From 2c22ea3adb7c83060d7e9ed5df6b47e1bb8a8f0d211668a024e725f8902497c4 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Fri, 7 Jun 2024 08:45:55 +0000
Subject: [PATCH] Accepting request 1179156 from isv:Rancher:Elemental:Dev

- Support Docker.FLAVOR in _multibuild (boo#1226010)

OBS-URL: https://build.opensuse.org/request/show/1179156
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-kiwi_metainfo_helper?expand=0&rev=38
---
 kiwi_metainfo_helper                     |  4 +--
 obs-service-kiwi_metainfo_helper.changes |  5 +++
 test.sh                                  | 42 +++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/kiwi_metainfo_helper b/kiwi_metainfo_helper
index 95f1fc3..79be72e 100644
--- a/kiwi_metainfo_helper
+++ b/kiwi_metainfo_helper
@@ -16,8 +16,8 @@ if [ -e "${BUILD_DATA}" ]; then
 	# 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
 
diff --git a/obs-service-kiwi_metainfo_helper.changes b/obs-service-kiwi_metainfo_helper.changes
index ac4380e..f8c1a32 100644
--- a/obs-service-kiwi_metainfo_helper.changes
+++ b/obs-service-kiwi_metainfo_helper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun  7 08:35:33 UTC 2024 - Andrea Mazzotti <andrea.mazzotti@suse.com>
+
+- Support Docker.FLAVOR in _multibuild (boo#1226010)
+
 -------------------------------------------------------------------
 Thu Feb  1 15:54:12 UTC 2024 - Marina Latini <marina.latini@suse.com>
 
diff --git a/test.sh b/test.sh
index 14fd5c6..a88f7e1 100644
--- a/test.sh
+++ b/test.sh
@@ -85,6 +85,46 @@ DISTURL=obs://build.suse.de/SUSE:SLE-15-SP3:Update:CR/images/5f0a221b7877396cbf9
 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/
 
@@ -104,4 +144,4 @@ SOURCEURL=https://local/package/show/local/local?rev=local
 RELEASE=0
 BUILDTIME=2018-10-30T09:19:02.074934628Z
 ARCH=noarch
-EOF
+EOF
\ No newline at end of file