| -rw-r--r-- | teams/cloud/container.xml | 68 | ||||
| -rw-r--r-- | tmt/plans/container/base/build-generic-minimal.fmf | 2 | ||||
| -rw-r--r-- | tmt/plans/container/base/build-generic.fmf | 2 | ||||
| -rw-r--r-- | tmt/plans/container/toolbox/build-toolbox.fmf | 2 |
4 files changed, 6 insertions, 68 deletions
diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml index c473bcf..2291a51 100644 --- a/teams/cloud/container.xml +++ b/teams/cloud/container.xml @@ -12,77 +12,15 @@ <requires profile="ContainerCore"/> </profile> </profiles> - <preferences profiles="Container-Base-Generic"> - <type image="oci"> - <containerconfig - name="fedora" - tag="rawhide" - maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" - > - <subcommand execute="/bin/bash"/> - <labels> - <label name="org.opencontainers.image.vendor" value="Fedora Project"/> - <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> - <label name="org.opencontainers.image.license" value="MIT"/> - <label name="org.opencontainers.image.version" value="rawhide"/> - <!-- Legacy attributes for backward compatibility --> - <label name="vendor" value="Fedora Project"/> - <label name="license" value="MIT"/> - <label name="version" value="rawhide"/> - </labels> - </containerconfig> - </type> - <timezone>Etc/UTC</timezone> - <locale>en_US</locale> - <rpm-locale-filtering>true</rpm-locale-filtering> - <rpm-excludedocs>true</rpm-excludedocs> - </preferences> - <preferences profiles="Container-Base-Generic-Minimal"> - <type image="oci"> - <containerconfig - name="fedora-minimal" - tag="rawhide" - maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" - > - <subcommand execute="/bin/bash"/> - <labels> - <label name="org.opencontainers.image.vendor" value="Fedora Project"/> - <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> - <label name="org.opencontainers.image.license" value="MIT"/> - <label name="org.opencontainers.image.version" value="rawhide"/> - <!-- Legacy attributes for backward compatibility --> - <label name="vendor" value="Fedora Project"/> - <label name="license" value="MIT"/> - <label name="version" value="rawhide"/> - </labels> - </containerconfig> - </type> + <preferences profiles="Container-Base-Generic-Minimal,Container-Base-Generic"> + <type image="tbz"/> <timezone>Etc/UTC</timezone> <locale>en_US</locale> <rpm-locale-filtering>true</rpm-locale-filtering> <rpm-excludedocs>true</rpm-excludedocs> </preferences> <preferences profiles="Container-Toolbox"> - <type image="oci"> - <containerconfig - name="fedora-toolbox" - tag="rawhide" - maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" - > - <subcommand execute="/bin/bash"/> - <labels> - <label name="org.opencontainers.image.vendor" value="Fedora Project"/> - <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> - <label name="org.opencontainers.image.license" value="MIT"/> - <label name="org.opencontainers.image.version" value="rawhide"/> - <label name="com.github.containers.toolbox" value="true"/> - <!-- Legacy attributes for backward compatibility --> - <label name="vendor" value="Fedora Project"/> - <label name="license" value="MIT"/> - <label name="version" value="rawhide"/> - </labels> - </containerconfig> - </type> + <type image="tbz"/> <timezone>Etc/UTC</timezone> <locale>en_US</locale> <rpm-locale-filtering>false</rpm-locale-filtering> diff --git a/tmt/plans/container/base/build-generic-minimal.fmf b/tmt/plans/container/base/build-generic-minimal.fmf index ac82294..803cd01 100644 --- a/tmt/plans/container/base/build-generic-minimal.fmf +++ b/tmt/plans/container/base/build-generic-minimal.fmf @@ -2,7 +2,7 @@ summary: Build Minimal Generic base container image discover: how: fmf environment: - image_type: oci + image_type: tbz image_profile: Container-Base-Generic-Minimal execute: how: tmt diff --git a/tmt/plans/container/base/build-generic.fmf b/tmt/plans/container/base/build-generic.fmf index 07b4eb5..83e6100 100644 --- a/tmt/plans/container/base/build-generic.fmf +++ b/tmt/plans/container/base/build-generic.fmf @@ -2,7 +2,7 @@ summary: Build Generic base container image discover: how: fmf environment: - image_type: oci + image_type: tbz image_profile: Container-Base-Generic execute: how: tmt diff --git a/tmt/plans/container/toolbox/build-toolbox.fmf b/tmt/plans/container/toolbox/build-toolbox.fmf index b30ed97..40692c3 100644 --- a/tmt/plans/container/toolbox/build-toolbox.fmf +++ b/tmt/plans/container/toolbox/build-toolbox.fmf @@ -2,7 +2,7 @@ summary: Build Toolbox container image discover: how: fmf environment: - image_type: oci + image_type: tbz image_profile: Container-Toolbox execute: how: tmt |