Test build for #1830

SUSE · Oct 11, 2024 · c76bb3e · c76bb3e
1 parent 95a9a60
commit c76bb3e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/base-image/base-image.kiwi b/base-image/base-image.kiwi
@@ -14,7 +14,7 @@ https://github.com/SUSE/BCI-dockerfile-generator
 Please submit bugfixes or comments via https://bugs.opensuse.org/
 You can contact the BCI team via https://github.com/SUSE/bci/discussions
 -->
-<!-- OBS-AddTag: bci/bci-base:%OS_VERSION_ID_SP% bci/bci-base:%OS_VERSION_ID_SP%-%RELEASE% -->
+<!-- OBS-AddTag: bci/bci-base:%OS_VERSION_ID_SP%-%RELEASE% bci/bci-base:%OS_VERSION_ID_SP% -->
 <!-- OBS-ExclusiveArch: aarch64 x86_64 ppc64le s390x -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
@@ -28,8 +28,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <type image="docker">
       <containerconfig
           name="bci/bci-base"
-          tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%-%RELEASE%">
+          tag="%OS_VERSION_ID_SP%-%RELEASE%"
+          additionaltags="%OS_VERSION_ID_SP%">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.bci.base">
             <label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>

diff --git a/busybox-image/busybox-image.kiwi b/busybox-image/busybox-image.kiwi
@@ -14,7 +14,7 @@ https://github.com/SUSE/BCI-dockerfile-generator
 Please submit bugfixes or comments via https://bugs.opensuse.org/
 You can contact the BCI team via https://github.com/SUSE/bci/discussions
 -->
-<!-- OBS-AddTag: bci/bci-busybox:%OS_VERSION_ID_SP% bci/bci-busybox:%OS_VERSION_ID_SP%-%RELEASE% -->
+<!-- OBS-AddTag: bci/bci-busybox:%OS_VERSION_ID_SP%-%RELEASE% bci/bci-busybox:%OS_VERSION_ID_SP% -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="busybox-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -27,8 +27,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <type image="docker">
       <containerconfig
           name="bci/bci-busybox"
-          tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%-%RELEASE%">
+          tag="%OS_VERSION_ID_SP%-%RELEASE%"
+          additionaltags="%OS_VERSION_ID_SP%">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.bci.busybox">
             <label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>

diff --git a/init-image/Dockerfile b/init-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/bci-init:%OS_VERSION_ID_SP%
 #!BuildTag: bci/bci-init:%OS_VERSION_ID_SP%-%RELEASE%
+#!BuildTag: bci/bci-init:%OS_VERSION_ID_SP%
 
 FROM bci/bci-base:16.0
 

diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/kiwi:10
 #!BuildTag: bci/kiwi:10-%RELEASE%
+#!BuildTag: bci/kiwi:10
 #!BuildTag: bci/kiwi:10.1
 #!BuildTag: bci/kiwi:10.1.10
 

diff --git a/micro-image/micro-image.kiwi b/micro-image/micro-image.kiwi
@@ -14,7 +14,7 @@ https://github.com/SUSE/BCI-dockerfile-generator
 Please submit bugfixes or comments via https://bugs.opensuse.org/
 You can contact the BCI team via https://github.com/SUSE/bci/discussions
 -->
-<!-- OBS-AddTag: bci/bci-micro:%OS_VERSION_ID_SP% bci/bci-micro:%OS_VERSION_ID_SP%-%RELEASE% -->
+<!-- OBS-AddTag: bci/bci-micro:%OS_VERSION_ID_SP%-%RELEASE% bci/bci-micro:%OS_VERSION_ID_SP% -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="micro-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -27,8 +27,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <type image="docker">
       <containerconfig
           name="bci/bci-micro"
-          tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%-%RELEASE%">
+          tag="%OS_VERSION_ID_SP%-%RELEASE%"
+          additionaltags="%OS_VERSION_ID_SP%">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.bci.micro">
             <label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>

diff --git a/minimal-image/minimal-image.kiwi b/minimal-image/minimal-image.kiwi
@@ -14,7 +14,7 @@ https://github.com/SUSE/BCI-dockerfile-generator
 Please submit bugfixes or comments via https://bugs.opensuse.org/
 You can contact the BCI team via https://github.com/SUSE/bci/discussions
 -->
-<!-- OBS-AddTag: bci/bci-minimal:%OS_VERSION_ID_SP% bci/bci-minimal:%OS_VERSION_ID_SP%-%RELEASE% -->
+<!-- OBS-AddTag: bci/bci-minimal:%OS_VERSION_ID_SP%-%RELEASE% bci/bci-minimal:%OS_VERSION_ID_SP% -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="minimal-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -27,8 +27,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <type image="docker" derived_from="obsrepositories:/bci/bci-micro#16.0">
       <containerconfig
           name="bci/bci-minimal"
-          tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%-%RELEASE%">
+          tag="%OS_VERSION_ID_SP%-%RELEASE%"
+          additionaltags="%OS_VERSION_ID_SP%">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.bci.minimal">
             <label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>

diff --git a/sle16-kernel-module-devel-image/Dockerfile b/sle16-kernel-module-devel-image/Dockerfile
@@ -15,8 +15,8 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: bci/bci-sle16-kernel-module-devel:%OS_VERSION_ID_SP%
 #!BuildTag: bci/bci-sle16-kernel-module-devel:%OS_VERSION_ID_SP%-%RELEASE%
+#!BuildTag: bci/bci-sle16-kernel-module-devel:%OS_VERSION_ID_SP%
 
 FROM bci/bci-base:16.0