Merge pull request agama-project#916 from openSUSE/user_patterns

Make the user visible patterns configurable, added MicroOS products

.yupdate.post

@@ -25,8 +25,8 @@ function restart_service() {
 
   if [ -n "$SERVICE_START" ]; then
     SERVICE_START_UNIX_TIME=$(date -d "$SERVICE_START" +"%s")
-    # find the date of the latest file in the gem
-    NEWEST_FILE_TIME=$(find /usr/lib*/ruby/gems/*/gems/$SERVICE_NAME-* -exec stat --format %Y "{}" \; | sort -nr | head -n 1)
+    # find the date of the latest file in the product configuration or in the gem
+    NEWEST_FILE_TIME=$(find /usr/share/agama/products.d /usr/lib*/ruby/gems/*/gems/$SERVICE_NAME-* -exec stat --format %Y "{}" \; | sort -nr | head -n 1)
 
     # when a file is newer than the start time then restart the service
     if [ -n "$NEWEST_FILE_TIME" ] && [ "$SERVICE_START_UNIX_TIME" -lt "$NEWEST_FILE_TIME" ]; then

Rakefile

@@ -170,5 +170,21 @@ if ENV["YUPDATE_FORCE"] == "1" || File.exist?("/.packages.initrd") || live_iso?
       FileUtils.mkdir_p(File.join(destdir, "/usr/share"))
       FileUtils.cp_r("playwright/.", File.join(destdir, "/usr/share/agama-playwright"))
     end
+
+    if ENV["YUPDATE_SKIP_PRODUCTS"] != "1"
+      files = Dir.glob("products.d/*.y{a}ml")
+      files.each do |f|
+        # the sources contain several products, update only the existing files
+        oldfile = File.join("/usr/share/agama/", f)
+        if File.exist?(oldfile)
+          target = File.join(destdir, "/usr/share/agama/", f)
+          FileUtils.mkdir_p(File.dirname(target))
+          FileUtils.cp(f, target)
+        else
+          # if there is a new product file it needs to be copied manually
+          puts "Skipping product file: #{f}"
+        end
+      end
+    end
   end
 end

doc/yaml_config.md

@@ -38,6 +38,15 @@ Array of patterns that have to be selected.
 
 Array of patterns that should be selected but can be deselected or skipped if not available.
 
+#### user\_patterns
+
+Array of patterns that are displayed in the pattern selector UI and user can
+select them to install.
+
+If the list is empty then the pattern selector is not displayed. If the key is
+not defined or the value is missing or is `null` then all available user visible
+patterns are displayed.
+
 ### security
 
 Options related to security

products.d/ALP-Dolomite.yaml

@@ -23,6 +23,8 @@ software:
     - alp_cockpit
     - alp_hardware
   optional_patterns: null # no optional pattern shared
+  # no user selectable patterns, do not display the pattern selector
+  user_patterns: []
   mandatory_packages:
     - package: ppc64-diag # Needed for hardware-based installations
       archs: ppc64

products.d/agama-products-opensuse.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec  4 14:11:51 UTC 2023 - Ancor Gonzalez Sosa <[email protected]>
+
+- Preliminary definitions of openSUSE MicroOS products
+- Remove Leap 16.0 for now
+
 -------------------------------------------------------------------
 Mon Oct 30 14:38:51 UTC 2023 - Josef Reidinger <[email protected]>
 

products.d/agama-products-opensuse.spec

@@ -52,8 +52,9 @@ install -m 0644 *.yaml %{buildroot}%{_datadir}/agama/products.d
 %files
 %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
-%{_datadir}/agama/products.d/leap16.yaml
 
 %files -n agama-products-ALP-Dolomite
 %dir %{_datadir}/agama

products.d/microos-desktop.yaml

@@ -0,0 +1,110 @@
+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:
+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