agama-project · dgdavid · Jan 28, 2025 · Jan 21, 2025 · Jan 21, 2025 · Jan 21, 2025
diff --git a/products.d/agama-products.changes b/products.d/agama-products.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Jan 24 06:45:45 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Change the registration property in a product's definition to a
+  boolean (gh#agama-project/agama#1938).
+
+-------------------------------------------------------------------
+Thu Jan 23 10:43:32 UTC 2025 - Josef Reidinger <jreidinger@suse.com>
+
+- Set installation labels for SLES and SLES4SAP
+  (gh#agama-project/agama#1937)
+
 -------------------------------------------------------------------
 Mon Jan 20 10:36:19 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

diff --git a/products.d/sles_160.yaml b/products.d/sles_160.yaml
@@ -1,6 +1,6 @@
 id: SLES
 name: SUSE Linux Enterprise Server 16.0 Beta
-registration: "mandatory"
+registration: true
 version: "16-0"
 license: "license.beta"
 # ------------------------------------------------------------------------------
@@ -54,6 +54,15 @@ translations:
       bulutta ve uçta iş açısından kritik iş yüklerini çalıştırır.
 software:
   installation_repositories: []
+  installation_labels:
+    - label: SLES160-x86_64
+      archs: x86_64
+    - label: SLES160-arch64
+      archs: aarch64
+    - label: SLES160-s390x
+      archs: s390
+    - label: SLES160-ppc64
+      archs: ppc
 
   mandatory_patterns:
     - base_traditional

diff --git a/products.d/sles_sap_160.yaml b/products.d/sles_sap_160.yaml
@@ -1,7 +1,7 @@
 id: SLES_SAP
 name: SUSE Linux Enterprise Server for SAP Applications 16.0 Beta
 archs: x86_64,aarch64,ppc
-registration: "mandatory"
+registration: true
 version: "16-0"
 license: "license.beta"
 # ------------------------------------------------------------------------------
@@ -19,6 +19,13 @@ translations:
   description:
 software:
   installation_repositories: []
+  installation_labels:
+    - label: S4SAP160-x86_64
+      archs: x86_64
+    - label: S4SAP160-arch64
+      archs: aarch64
+    - label: S4SAP160-ppc64
+      archs: ppc
 
   mandatory_patterns:
     - base_traditional

diff --git a/rust/agama-lib/src/manager.rs b/rust/agama-lib/src/manager.rs
@@ -67,6 +67,8 @@ pub enum InstallationPhase {
     Config,
     /// Installation phase.
     Install,
+    /// Finished installation phase.
+    Finish,
 }
 
 impl TryFrom<u32> for InstallationPhase {
@@ -77,6 +79,7 @@ impl TryFrom<u32> for InstallationPhase {
             0 => Ok(Self::Startup),
             1 => Ok(Self::Config),
             2 => Ok(Self::Install),
+            3 => Ok(Self::Finish),
             _ => Err(ServiceError::UnknownInstallationPhase(value)),
         }
     }

diff --git a/rust/agama-lib/src/product/client.rs b/rust/agama-lib/src/product/client.rs
@@ -1,4 +1,4 @@
-// Copyright (c) [2024] SUSE LLC
+// Copyright (c) [2024-2025] SUSE LLC
 //
 // All Rights Reserved.
 //
@@ -43,7 +43,7 @@ pub struct Product {
     /// Product icon (e.g., "default.svg")
     pub icon: String,
     /// Registration requirement
-    pub registration: RegistrationRequirement,
+    pub registration: bool,
     /// License ID
     pub license: Option<String>,
 }
@@ -80,9 +80,7 @@ impl<'a> ProductClient<'a> {
                     None => "default.svg",
                 };
 
-                let registration = get_property::<String>(&data, "registration")
-                    .map(|r| RegistrationRequirement::from_str(&r).unwrap_or_default())
-                    .unwrap_or_default();
+                let registration = get_property::<bool>(&data, "registration").unwrap_or(false);
 
                 let license = get_optional_property::<String>(&data, "license").unwrap_or_default();
 

diff --git a/rust/agama-lib/src/proxies/issues.rs b/rust/agama-lib/src/proxies/issues.rs
@@ -23,5 +23,5 @@ use zbus::proxy;
 pub trait Issues {
     /// All property
     #[zbus(property)]
-    fn all(&self) -> zbus::Result<Vec<(String, String, u32, u32)>>;
+    fn all(&self) -> zbus::Result<Vec<(String, String, String, u32, u32)>>;
 }
diff --git a/rust/agama-lib/src/store.rs b/rust/agama-lib/src/store.rs
@@ -104,6 +104,11 @@ impl Store {
             }
         }
 
+        // import the users (esp. the root password) before initializing software,
+        // if software fails the Web UI would be stuck in the root password dialog
+        if let Some(user) = &settings.user {
+            self.users.store(user).await?;
+        }
         if let Some(network) = &settings.network {
             self.network.store(network).await?;
         }
@@ -119,9 +124,6 @@ impl Store {
         if let Some(software) = &settings.software {
             self.software.store(software).await?;
         }
-        if let Some(user) = &settings.user {
-            self.users.store(user).await?;
-        }
         if settings.storage.is_some() || settings.storage_autoyast.is_some() {
             self.storage.store(&settings.into()).await?
         }

diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
@@ -1,4 +1,4 @@
-// Copyright (c) [2024] SUSE LLC
+// Copyright (c) [2024-2025] SUSE LLC
 //
 // All Rights Reserved.
 //
@@ -325,11 +325,12 @@ pub struct Issue {
     details: Option<String>,
     source: u32,
     severity: u32,
+    kind: String,
 }
 
 impl Issue {
     pub fn from_tuple(
-        (description, details, source, severity): (String, String, u32, u32),
+        (description, kind, details, source, severity): (String, String, String, u32, u32),
     ) -> Self {
         let details = if details.is_empty() {
             None
@@ -339,6 +340,7 @@ impl Issue {
 
         Self {
             description,
+            kind,
             details,
             source,
             severity,

diff --git a/rust/package/agama.changes b/rust/package/agama.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Fri Jan 24 09:33:31 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Introduce a new installation phase "finish"
+  (gh#agama-project/agama#1616).
+
+-------------------------------------------------------------------
+Fri Jan 24 06:43:05 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Change the registration property in a product's definition to a
+  boolean (gh#agama-project/agama#1938).
+
+-------------------------------------------------------------------
+Wed Jan 22 14:49:56 UTC 2025 - Ladislav Slezák <lslezak@suse.com>
+
+- Added a workaround for stuck web UI when importing auto
+  installation profile with unreachable software repository
+  (gh#agama-project/agama#1933)
+
 -------------------------------------------------------------------
 Mon Jan 20 16:44:02 UTC 2025 - Ladislav Slezák <lslezak@suse.com>
 

diff --git a/rust/package/agama.spec b/rust/package/agama.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package agama
 #
-# Copyright (c) 2023-2024 SUSE LLC
+# Copyright (c) 2023-2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 Name:           agama
@@ -23,10 +23,12 @@ Summary:        Agama Installer
 #               If you know the license, put it's SPDX string here.
 #               Alternately, you can use cargo lock2rpmprovides to help generate this.
 License:        GPL-2.0-or-later
-Url:            https://github.com/opensuse/agama
+Url:            https://github.com/agama-project/agama
 Source0:        agama.tar
 Source1:        vendor.tar.zst
 
+# defines the "limit_build" macro used in the "build" section below
+BuildRequires:  memory-constraints
 BuildRequires:  cargo-packaging
 BuildRequires:  pkgconfig(openssl)
 # used in tests for dbus service
@@ -70,7 +72,7 @@ Version:        0
 Release:        0
 Summary:        Agama command-line interface
 License:        GPL-2.0-only
-Url:            https://github.com/opensuse/agama
+Url:            https://github.com/agama-project/agama
 
 %description -n agama-cli
 Command line program to interact with the Agama installer.
@@ -129,6 +131,10 @@ package contains a systemd service to run scripts when booting the installed sys
 # find vendor -type f -name \*.rs -exec chmod -x '{}' \;
 
 %build
+# Require at least 1.3GB RAM per each parallel job (the size is in MB),
+# this can limit the number of parallel jobs on systems with relatively small memory.
+%{limit_build -m 1300}
+
 %{cargo_build}
 cargo run --package xtask -- manpages
 gzip out/man/*

diff --git a/service/lib/agama/dbus/clients/manager.rb b/service/lib/agama/dbus/clients/manager.rb
@@ -63,6 +63,8 @@ def current_installation_phase
             InstallationPhase::CONFIG
           when DBus::Manager::INSTALL_PHASE
             InstallationPhase::INSTALL
+          when DBus::Manager::FINISH_PHASE
+            InstallationPhase::FINISH
           end
         end
 

diff --git a/service/lib/agama/dbus/clients/with_issues.rb b/service/lib/agama/dbus/clients/with_issues.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -52,9 +52,10 @@ def issues_from(dbus_object)
 
         dbus_object[ISSUES_IFACE]["All"].map do |dbus_issue|
           Issue.new(dbus_issue[0],
-            details:  dbus_issue[1],
-            source:   sources[dbus_issue[2]],
-            severity: severities[dbus_issue[3]])
+            kind:     dbus_issue[1].to_sym,
+            details:  dbus_issue[2],
+            source:   sources[dbus_issue[3]],
+            severity: severities[dbus_issue[4]])
         end
       end
     end

diff --git a/service/lib/agama/dbus/interfaces/issues.rb b/service/lib/agama/dbus/interfaces/issues.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -48,9 +48,9 @@ def dbus_issues
             else
               0
             end
-            severity = issue.severity == Agama::Issue::Severity::WARN ? 0 : 1
+            severity = (issue.severity == Agama::Issue::Severity::WARN) ? 0 : 1
 
-            [issue.description, issue.details.to_s, source, severity]
+            [issue.description, issue.kind.to_s, issue.details.to_s, source, severity]
           end
         end
 
@@ -64,7 +64,7 @@ def self.included(base)
           base.class_eval do
             dbus_interface ISSUES_INTERFACE do
               # @see {#dbus_issues}
-              dbus_reader :dbus_issues, "a(ssuu)", dbus_name: "All"
+              dbus_reader :dbus_issues, "a(sssuu)", dbus_name: "All"
             end
           end
         end

diff --git a/service/lib/agama/dbus/manager.rb b/service/lib/agama/dbus/manager.rb
@@ -58,6 +58,7 @@ def initialize(backend, logger)
       STARTUP_PHASE = 0
       CONFIG_PHASE = 1
       INSTALL_PHASE = 2
+      FINISH_PHASE = 3
 
       dbus_interface MANAGER_INTERFACE do
         dbus_method(:Probe, "") { config_phase }
@@ -111,7 +112,8 @@ def installation_phases
         [
           { "id" => STARTUP_PHASE, "label" => "startup" },
           { "id" => CONFIG_PHASE,  "label" => "config" },
-          { "id" => INSTALL_PHASE, "label" => "install" }
+          { "id" => INSTALL_PHASE, "label" => "install" },
+          { "id" => FINISH_PHASE, "label"  => "finish" }
         ]
       end
 
@@ -122,6 +124,7 @@ def current_installation_phase
         return STARTUP_PHASE if backend.installation_phase.startup?
         return CONFIG_PHASE if backend.installation_phase.config?
         return INSTALL_PHASE if backend.installation_phase.install?
+        return FINISH_PHASE if backend.installation_phase.finish?
       end
 
       # States whether installation runs on iguana

diff --git a/service/lib/agama/dbus/software/manager.rb b/service/lib/agama/dbus/software/manager.rb
@@ -70,8 +70,8 @@ def issues
           # array of repository properties: pkg-bindings ID, alias, name, URL, product dir, enabled
           # and loaded flag
           dbus_method :ListRepositories, "out Result:a(issssbb)" do
-            backend.repositories.repositories.map do |repo|
-              [
+            [
+              backend.repositories.repositories.map do |repo|
                 [
                   repo.repo_id,
                   repo.repo_alias,
@@ -81,8 +81,8 @@ def issues
                   repo.enabled?,
                   !!repo.loaded?
                 ]
-              ]
-            end
+              end
+            ]
           end
 
           # value of result hash is category, description, icon, summary and order

diff --git a/service/lib/agama/dbus/software/product.rb b/service/lib/agama/dbus/software/product.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -180,7 +180,7 @@ def register(reg_code, email: nil)
             [1, "Product not selected yet"]
           elsif backend.registration.reg_code
             [2, "Product already registered"]
-          elsif backend.registration.requirement == Agama::Registration::Requirement::NO
+          elsif !backend.product.registration
             [3, "Product does not require registration"]
           else
             connect_result(first_error_code: 4) do
@@ -254,6 +254,7 @@ def register_callbacks
           #   software related issues.
           backend.registration.on_change { issues_properties_changed }
           backend.registration.on_change { registration_properties_changed }
+          backend.on_issues_change { issues_properties_changed }
         end
 
         def registration_properties_changed