From 8f96ce6539642fbf6609b98e8e799312eecf7172 Mon Sep 17 00:00:00 2001
From: "lemon.li" <leli@suse.com>
Date: Thu, 15 Aug 2024 15:32:26 +0800
Subject: [PATCH] Update for agama autoinstallation

---
 data/yam/agama/auto/default_tumbleweed.json | 23 ++++++++++-----------
 lib/Yam/agama/agama_base.pm                 |  2 +-
 tests/yam/agama/auto.pm                     | 12 ++++++-----
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/data/yam/agama/auto/default_tumbleweed.json b/data/yam/agama/auto/default_tumbleweed.json
index 4e535fcac35d..f96761998578 100644
--- a/data/yam/agama/auto/default_tumbleweed.json
+++ b/data/yam/agama/auto/default_tumbleweed.json
@@ -1,14 +1,13 @@
 {
-   "software": {
-      "product": "Tumbleweed"
-   },
-   "user": {
-      "fullName": "Bernhard M. Wiedemann",
-      "password": "nots3cr3t",
-      "userName": "bernhard"
-   },
-   "root": {
-      "password": "nots3cr3t"
-   }
+  "product": {
+    "id": "Tumbleweed"
+  },
+  "user": {
+    "fullName": "Bernhard M. Wiedemann",
+    "password": "nots3cr3t",
+    "userName": "bernhard"
+  },
+  "root": {
+    "password": "nots3cr3t"
+  }
 }
-
diff --git a/lib/Yam/agama/agama_base.pm b/lib/Yam/agama/agama_base.pm
index 6ab8f1a1756e..b2b53f19e0b6 100644
--- a/lib/Yam/agama/agama_base.pm
+++ b/lib/Yam/agama/agama_base.pm
@@ -21,7 +21,7 @@ sub pre_run_hook {
 sub post_fail_hook {
     select_console 'root-console';
     # "agama logs store" gathers output from dmesg, journalctl and y2logs.
-    save_and_upload_log('agama logs store', "/tmp/agama_logs.tar.bz2");
+    save_and_upload_log('agama logs store', "/tmp/agama-logs.tar.gz");
     upload_traces();
 }
 
diff --git a/tests/yam/agama/auto.pm b/tests/yam/agama/auto.pm
index 7906b288f3e4..54b079afbef6 100644
--- a/tests/yam/agama/auto.pm
+++ b/tests/yam/agama/auto.pm
@@ -12,11 +12,13 @@ use testapi;
 use utils 'clear_console';
 
 sub run {
-    assert_screen('agama-install-finished', 1200);
-
-    select_console 'root-console';
-    clear_console;
-    enter_cmd "reboot";
+    assert_screen([qw(agama-signing-key agama-install-finished)], 1200);
+    if (match_has_tag 'agama-signing-key') {
+        record_info('Softfail', "opensuse signing keys are not imported", result => 'softfail');
+        assert_and_click('trust');
+        assert_screen('agama-install-finished', 1000);
+    }
+    assert_and_click('reboot');
 
     # For agama test, it is too short time to match the grub2, so we create
     # a new needle to avoid too much needles loaded.