Test build for #1423

SUSE · Jul 16, 2024 · 1821b32 · 1821b32
1 parent d6fae9c
commit 1821b32
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 18 deletions.
diff --git a/busybox-image/busybox-image.kiwi b/busybox-image/busybox-image.kiwi
@@ -14,10 +14,9 @@ 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% bci/bci-busybox:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
-<image schemaversion="7.4" name="busybox-image" xmlns:suse_label_helper="com.suse.label_helper">
+<image schemaversion="7.5" name="busybox-image" xmlns:suse_label_helper="com.suse.label_helper">
   <description type="system">
     <author>SUSE LLC</author>
     <contact>https://www.suse.com/</contact>
@@ -28,7 +27,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
       <containerconfig
           name="bci/bci-busybox"
           tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest"
+          additionalnames="bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE%,bci/bci-busybox:latest"
           maintainer="SUSE LLC (https://www.suse.com/)">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.bci.busybox">

diff --git a/distribution-image/distribution-image.kiwi b/distribution-image/distribution-image.kiwi
@@ -14,10 +14,9 @@ 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: suse/registry:%%registry_version%% suse/registry:%%registry_version%%-%RELEASE% suse/registry:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
-<image schemaversion="7.4" name="registry-image" xmlns:suse_label_helper="com.suse.label_helper">
+<image schemaversion="7.5" name="registry-image" xmlns:suse_label_helper="com.suse.label_helper">
   <description type="system">
     <author>SUSE LLC</author>
     <contact>https://www.suse.com/</contact>
@@ -28,7 +27,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
       <containerconfig
           name="suse/registry"
           tag="%%registry_version%%"
-          additionaltags="%%registry_version%%-%RELEASE%,latest"
+          additionalnames="suse/registry:%%registry_version%%-%RELEASE%,suse/registry:latest"
           user="registry"
           maintainer="SUSE LLC (https://www.suse.com/)">
         <labels>

diff --git a/git-image/git-image.kiwi b/git-image/git-image.kiwi
@@ -14,10 +14,9 @@ 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: suse/git:%%git_version%% suse/git:%%git_version%%-%RELEASE% suse/git:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
-<image schemaversion="7.4" name="git-image" xmlns:suse_label_helper="com.suse.label_helper">
+<image schemaversion="7.5" name="git-image" xmlns:suse_label_helper="com.suse.label_helper">
   <description type="system">
     <author>SUSE LLC</author>
     <contact>https://www.suse.com/</contact>
@@ -28,7 +27,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
       <containerconfig
           name="suse/git"
           tag="%%git_version%%"
-          additionaltags="%%git_version%%-%RELEASE%,latest"
+          additionalnames="suse/git:%%git_version%%-%RELEASE%,suse/git:latest"
           maintainer="SUSE LLC (https://www.suse.com/)">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.application.git">

diff --git a/helm-image/helm-image.kiwi b/helm-image/helm-image.kiwi
@@ -14,10 +14,9 @@ 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: suse/helm:3.13 suse/helm:3.13-%RELEASE% suse/helm:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
-<image schemaversion="7.4" name="helm-image" xmlns:suse_label_helper="com.suse.label_helper">
+<image schemaversion="7.5" name="helm-image" xmlns:suse_label_helper="com.suse.label_helper">
   <description type="system">
     <author>SUSE LLC</author>
     <contact>https://www.suse.com/</contact>
@@ -28,7 +27,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
       <containerconfig
           name="suse/helm"
           tag="3.13"
-          additionaltags="3.13-%RELEASE%,latest"
+          additionalnames="suse/helm:3.13-%RELEASE%,suse/helm:latest"
           maintainer="SUSE LLC (https://www.suse.com/)">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.application.helm">

diff --git a/micro-image/micro-image.kiwi b/micro-image/micro-image.kiwi
@@ -14,10 +14,9 @@ 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% bci/bci-micro:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
-<image schemaversion="7.4" name="micro-image" xmlns:suse_label_helper="com.suse.label_helper">
+<image schemaversion="7.5" name="micro-image" xmlns:suse_label_helper="com.suse.label_helper">
   <description type="system">
     <author>SUSE LLC</author>
     <contact>https://www.suse.com/</contact>
@@ -28,7 +27,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
       <containerconfig
           name="bci/bci-micro"
           tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest"
+          additionalnames="bci/bci-micro:%OS_VERSION_ID_SP%.%RELEASE%,bci/bci-micro:latest"
           maintainer="SUSE LLC (https://www.suse.com/)">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.bci.micro">

diff --git a/minimal-image/minimal-image.kiwi b/minimal-image/minimal-image.kiwi
@@ -14,10 +14,9 @@ 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% bci/bci-minimal:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
-<image schemaversion="7.4" name="minimal-image" xmlns:suse_label_helper="com.suse.label_helper">
+<image schemaversion="7.5" name="minimal-image" xmlns:suse_label_helper="com.suse.label_helper">
   <description type="system">
     <author>SUSE LLC</author>
     <contact>https://www.suse.com/</contact>
@@ -28,7 +27,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
       <containerconfig
           name="bci/bci-minimal"
           tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest"
+          additionalnames="bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE%,bci/bci-minimal:latest"
           maintainer="SUSE LLC (https://www.suse.com/)">
         <labels>
           <suse_label_helper:add_prefix prefix="com.suse.bci.minimal">