Test build for #1423

Author: SUSE Update Bot

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: opensuse/bci/bci-busybox:%OS_VERSION_ID_SP% opensuse/bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE% opensuse/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>openSUSE Project</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="opensuse/bci/bci-busybox"
           tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest"
+          additionalnames="opensuse/bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE%,opensuse/bci/bci-busybox:latest"
           maintainer="openSUSE (https://www.opensuse.org/)">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.busybox">

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: opensuse/registry:%%registry_version%% opensuse/registry:%%registry_version%%-%RELEASE% opensuse/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>openSUSE Project</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="opensuse/registry"
           tag="%%registry_version%%"
-          additionaltags="%%registry_version%%-%RELEASE%,latest"
+          additionalnames="opensuse/registry:%%registry_version%%-%RELEASE%,opensuse/registry:latest"
           user="registry"
           maintainer="openSUSE (https://www.opensuse.org/)">
         <labels>

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: opensuse/git:%%git_version%% opensuse/git:%%git_version%%-%RELEASE% opensuse/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>openSUSE Project</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="opensuse/git"
           tag="%%git_version%%"
-          additionaltags="%%git_version%%-%RELEASE%,latest"
+          additionalnames="opensuse/git:%%git_version%%-%RELEASE%,opensuse/git:latest"
           maintainer="openSUSE (https://www.opensuse.org/)">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.application.git">

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: opensuse/helm:3.15 opensuse/helm:3.15-%RELEASE% opensuse/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>openSUSE Project</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="opensuse/helm"
           tag="3.15"
-          additionaltags="3.15-%RELEASE%,latest"
+          additionalnames="opensuse/helm:3.15-%RELEASE%,opensuse/helm:latest"
           maintainer="openSUSE (https://www.opensuse.org/)">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.application.helm">

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: opensuse/bci/bci-micro:%OS_VERSION_ID_SP% opensuse/bci/bci-micro:%OS_VERSION_ID_SP%.%RELEASE% opensuse/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>openSUSE Project</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="opensuse/bci/bci-micro"
           tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest"
+          additionalnames="opensuse/bci/bci-micro:%OS_VERSION_ID_SP%.%RELEASE%,opensuse/bci/bci-micro:latest"
           maintainer="openSUSE (https://www.opensuse.org/)">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.micro">

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: opensuse/bci/bci-minimal:%OS_VERSION_ID_SP% opensuse/bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE% opensuse/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>openSUSE Project</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="opensuse/bci/bci-minimal"
           tag="%OS_VERSION_ID_SP%"
-          additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest"
+          additionalnames="opensuse/bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE%,opensuse/bci/bci-minimal:latest"
           maintainer="openSUSE (https://www.opensuse.org/)">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.minimal">

trivy-image/trivy-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: opensuse/trivy:%%trivy_version%% opensuse/trivy:%%trivy_version%%-%RELEASE% opensuse/trivy:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
-<image schemaversion="7.4" name="trivy-image" xmlns:suse_label_helper="com.suse.label_helper">
+<image schemaversion="7.5" name="trivy-image" xmlns:suse_label_helper="com.suse.label_helper">
   <description type="system">
     <author>openSUSE Project</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="opensuse/trivy"
           tag="%%trivy_version%%"
-          additionaltags="%%trivy_version%%-%RELEASE%,latest"
+          additionalnames="opensuse/trivy:%%trivy_version%%-%RELEASE%,opensuse/trivy:latest"
           maintainer="openSUSE (https://www.opensuse.org/)">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.application.trivy">