Skip to content

Commit

Permalink
Update for agama automation
Browse files Browse the repository at this point in the history
  • Loading branch information
lemon-suse committed Aug 16, 2024
1 parent e144945 commit 6f5ce44
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 18 deletions.
23 changes: 11 additions & 12 deletions data/yam/agama/auto/default_tumbleweed.json
Original file line number Diff line number Diff line change
@@ -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"
}
}

2 changes: 1 addition & 1 deletion lib/Yam/agama/agama_base.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
13 changes: 8 additions & 5 deletions tests/yam/agama/auto.pm
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,14 @@ 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') {
assert_and_click('trust');
record_info('Softfail', "opensuse signing keys are not imported", result => 'softfail');
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.
Expand Down

0 comments on commit 6f5ce44

Please sign in to comment.