From 7892dc393d3fdd1eb50e7528cb745f68c0ccab57 Mon Sep 17 00:00:00 2001
From: SUSE Update Bot <bci-internal@suse.de>
Date: Mon, 14 Oct 2024 11:23:06 +0000
Subject: [PATCH] Test build for #1815

---
 base-image/_service                      | 4 ++--
 busybox-image/_service                   | 4 ++--
 init-image/_service                      | 4 ++--
 kiwi-image/Dockerfile                    | 7 ++++---
 kiwi-image/_service                      | 4 ++--
 micro-image/_service                     | 4 ++--
 minimal-image/_service                   | 4 ++--
 sle16-kernel-module-devel-image/_service | 4 ++--
 8 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/base-image/_service b/base-image/_service
index bd1abb02d..0593b7b3f 100644
--- a/base-image/_service
+++ b/base-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="kiwi_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="kiwi_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
\ No newline at end of file
diff --git a/busybox-image/_service b/busybox-image/_service
index bd1abb02d..0593b7b3f 100644
--- a/busybox-image/_service
+++ b/busybox-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="kiwi_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="kiwi_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
\ No newline at end of file
diff --git a/init-image/_service b/init-image/_service
index 053a4f4f8..2bef4c2ab 100644
--- a/init-image/_service
+++ b/init-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="docker_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
\ No newline at end of file
diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile
index e7ad937d1..701258a66 100644
--- a/kiwi-image/Dockerfile
+++ b/kiwi-image/Dockerfile
@@ -15,10 +15,11 @@
 
 #!UseOBSRepositories
 
+#!BuildTag: bci/kiwi:10.1.10-%RELEASE%
+#!BuildTag: bci/kiwi:10.1.10
 #!BuildTag: bci/kiwi:10-%RELEASE%
 #!BuildTag: bci/kiwi:10
 #!BuildTag: bci/kiwi:10.1
-#!BuildTag: bci/kiwi:10.1.10
 
 FROM bci/bci-base:16.0
 
@@ -37,8 +38,8 @@ LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opencontainers.image.ref.name="10-%RELEASE%"
-LABEL org.opensuse.reference="registry.suse.com/bci/kiwi:10-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="10.1.10-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/bci/kiwi:10.1.10-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="sle-bci"
diff --git a/kiwi-image/_service b/kiwi-image/_service
index 053a4f4f8..2bef4c2ab 100644
--- a/kiwi-image/_service
+++ b/kiwi-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="docker_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
\ No newline at end of file
diff --git a/micro-image/_service b/micro-image/_service
index bd1abb02d..0593b7b3f 100644
--- a/micro-image/_service
+++ b/micro-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="kiwi_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="kiwi_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
\ No newline at end of file
diff --git a/minimal-image/_service b/minimal-image/_service
index bd1abb02d..0593b7b3f 100644
--- a/minimal-image/_service
+++ b/minimal-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="kiwi_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="kiwi_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
\ No newline at end of file
diff --git a/sle16-kernel-module-devel-image/_service b/sle16-kernel-module-devel-image/_service
index 053a4f4f8..2bef4c2ab 100644
--- a/sle16-kernel-module-devel-image/_service
+++ b/sle16-kernel-module-devel-image/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="docker_label_helper" mode="buildtime" />
+  <service name="kiwi_metainfo_helper" mode="buildtime" />
 </services>
\ No newline at end of file