diff --git a/products.d/agama-products-opensuse.changes b/products.d/agama-products-opensuse.changes index eb6cd2d50f..429e977ae2 100644 --- a/products.d/agama-products-opensuse.changes +++ b/products.d/agama-products-opensuse.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 21 11:35:51 UTC 2024 - Richard Brown + +- Remove definitions for MicroOS Desktop + ------------------------------------------------------------------- Mon Dec 4 14:11:51 UTC 2023 - Ancor Gonzalez Sosa diff --git a/products.d/agama-products-opensuse.spec b/products.d/agama-products-opensuse.spec index 9a5356629b..6305be437c 100644 --- a/products.d/agama-products-opensuse.spec +++ b/products.d/agama-products-opensuse.spec @@ -41,7 +41,6 @@ install -m 0644 *.yaml %{buildroot}%{_datadir}/agama/products.d %dir %{_datadir}/agama %dir %{_datadir}/agama/products.d %{_datadir}/agama/products.d/microos.yaml -%{_datadir}/agama/products.d/microos-desktop.yaml %{_datadir}/agama/products.d/tumbleweed.yaml %changelog diff --git a/products.d/microos-desktop.yaml b/products.d/microos-desktop.yaml deleted file mode 100644 index 6d8ff43b71..0000000000 --- a/products.d/microos-desktop.yaml +++ /dev/null @@ -1,139 +0,0 @@ -id: MicroOS-Desktop -name: openSUSE MicroOS Desktop -# ------------------------------------------------------------------------------ -# WARNING: When changing the product description delete the translations located -# at the at translations/description key below to avoid using obsolete -# translations!! -# ------------------------------------------------------------------------------ -description: 'A distribution for the desktop offering automatic updates and - rollback on top of the foundations of openSUSE MicroOS. Includes Podman - Container Runtime and allows to manage software using Gnome Software or KDE - Discover.' -# Do not manually change any translations! See README.md for more details. -translations: - description: - ca: Una distribució per a l'escriptori que ofereix actualitzacions automàtiques - i retrocessos sobre els fonaments de l'openSUSE MicroSO. Inclou el Podman - Container Runtime i permet gestionar programari mitjançant el Programari - del Gnome o el KDE Discover. - es: Una distribución para escritorio que ofrece actualizaciones automáticas y - reversión sobre los fundamentos de openSUSE MicroOS. Incluye Podman - Container Runtime y permite administrar software usando Gnome Software o - KDE Discover. - fr: Une distribution pour le bureau offrant des mises à jour automatiques et un - rétablissement au dessus des fondations d'openSUSE MicroOS. Inclut Podman - Container Runtime et permet de gérer les logiciels en utilisant Gnome - Software ou KDE Discover. - id: Distribusi untuk desktop yang menawarkan pembaruan dan rollback otomatis di - atas fondasi openSUSE MicroOS. Termasuk Podman Container Runtime dan - memungkinkan untuk mengelola perangkat lunak menggunakan Gnome Software - atau KDE Discover. - ja: openSUSE MicroOS をベースにし、自動的な更新およびロールバックの機能を提供するデスクトップ向けディストリビューションです。 Podman - のコンテナランタイムを含むほか、 Gnome Software や KDE Discover を利用してソフトウエア管理を行うこともできます。 - sv: En distribution för skrivbordet som erbjuder automatiska uppdateringar och - möjligheten att rulla tillbaka byggt ovanpå grunden av openSUSE MicroOS. - Inkluderar Podman behållarkörtid och gör det möjligt att hantera - programvara med Gnome Programvara eller KDE Discover. - tr: OpenSUSE MicroOS'un temellerine ek olarak otomatik güncellemeler ve geri - alma sunan, masaüstüne yönelik bir dağıtım. Podman Container Runtime'ı - içerir ve yazılımın Gnome Yazılımını veya KDE Discover'ı kullanarak - yönetilmesine olanak tanır. - zh_Hans: 在 openSUSE MicroOS 基础上提供自动更新和回滚的桌面设备发行版。包含 Podman 容器运行时,且允许透过 GNOME - Software 或 KDE Discover 管理软件。 -software: - installation_repositories: - - url: https://download.opensuse.org/tumbleweed/repo/oss/ - archs: x86_64 - - url: https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/ - archs: aarch64 - - url: https://download.opensuse.org/ports/zsystems/tumbleweed/repo/oss/ - archs: s390 - - url: https://download.opensuse.org/ports/ppc/tumbleweed/repo/oss/ - archs: ppc - - url: https://download.opensuse.org/tumbleweed/repo/non-oss/ - archs: x86_64 - # aarch64 does not have non-oss ports. Keep eye if it change - - url: https://download.opensuse.org/ports/zsystems/tumbleweed/repo/non-oss/ - archs: s390 - - url: https://download.opensuse.org/ports/ppc/tumbleweed/repo/non-oss/ - archs: ppc - - url: https://download.opensuse.org/update/tumbleweed/ - archs: x86_64 - - url: https://download.opensuse.org/ports/aarch64/update/tumbleweed/ - archs: aarch64 - - url: https://download.opensuse.org/ports/zsystems/update/tumbleweed/ - archs: s390 - - url: https://download.opensuse.org/ports/ppc/tumbleweed/repo/oss/ - archs: ppc - mandatory_patterns: - - microos_base - - microos_base_zypper - - microos_defaults - - microos_hardware - - container_runtime - - pattern: 32bit - archs: x86_64 - optional_patterns: - - microos_gnome_desktop - user_patterns: - - microos_gnome_desktop - - microos_kde_desktop - mandatory_packages: - - NetworkManager - optional_packages: null - base_product: MicroOS - -security: - lsm: selinux - available_lsms: - selinux: - patterns: - - microos_selinux - policy: enforcing - none: - patterns: null - -storage: - space_policy: delete - volumes: - - "/" - volume_templates: - - mount_path: "/" - filesystem: btrfs - btrfs: - snapshots: true - read_only: true - default_subvolume: "@" - subvolumes: - - path: home - - path: opt - - path: root - - path: srv - - path: usr/local - - path: boot/writable - # Unified var subvolume - https://lists.opensuse.org/opensuse-packaging/2017-11/msg00017.html - - path: var - copy_on_write: false - # Architecture specific subvolumes - - path: boot/grub2/arm64-efi - archs: aarch64 - - path: boot/grub2/arm-efi - archs: arm - - path: boot/grub2/i386-pc - archs: x86_64 - - path: boot/grub2/powerpc-ieee1275 - archs: ppc,!board_powernv - - path: boot/grub2/s390x-emu - archs: s390 - - path: boot/grub2/x86_64-efi - archs: x86_64 - - path: boot/grub2/riscv64-efi - archs: riscv64 - size: - auto: false - min: 5 GiB - outline: - required: true - snapshots_configurable: false - filesystems: - - btrfs diff --git a/service/test/agama/software/manager_test.rb b/service/test/agama/software/manager_test.rb index 5ea3a9bb6d..18e431d2fd 100644 --- a/service/test/agama/software/manager_test.rb +++ b/service/test/agama/software/manager_test.rb @@ -230,12 +230,11 @@ describe "#products" do it "returns the list of known products" do products = subject.products - expect(products.size).to eq(3) + expect(products.size).to eq(2) expect(products).to all(be_a(Agama::Software::Product)) expect(products).to contain_exactly( an_object_having_attributes(id: "Tumbleweed"), - an_object_having_attributes(id: "MicroOS"), - an_object_having_attributes(id: "MicroOS-Desktop") + an_object_having_attributes(id: "MicroOS") ) end end