srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-21 21:43:08 +00:00
Code Issues Releases Activity

Ensure repos are set up for cockpit tests

Browse Source 
When running these tests on updates we inherit the main disk
image from server_cockpit_default, which has the repo config,
but the actual repo data is on HDD_3 which is not inherited.
We need to re-download the updates here to ensure they're
available to the tests (the automatic update test installs the
dnf-automatic package, so it should pull it from the update repo
if it is part of the update being tested).

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2024-04-25 16:52:09 -07:00
parent a7ec8ada2b
commit 5cd9c83e73
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.pm
View File

@ -248,7 +248,6 @@ sub _load_early_postinstall_tests {
# Appropriate login method for install type # Appropriate login method for install type
if (get_var("DESKTOP")) { if (get_var("DESKTOP")) {
_load_instance("tests/_graphical_wait_login", $instance); _load_instance("tests/_graphical_wait_login", $instance);
_load_instance("tests/_snapshot_only") if (get_var("LOGIN_SNAPSHOT"));
} }
# Test non-US input at this point, on language tests # Test non-US input at this point, on language tests
if (get_var("SWITCHED_LAYOUT") || get_var("INPUT_METHOD")) { if (get_var("SWITCHED_LAYOUT") || get_var("INPUT_METHOD")) {
@ -264,7 +263,6 @@ sub _load_early_postinstall_tests {
# the installation is interrupted on purpose. # the installation is interrupted on purpose.
unless (get_var("DESKTOP") || get_var("CRASH_REPORT")) { unless (get_var("DESKTOP") || get_var("CRASH_REPORT")) {
_load_instance("tests/_console_wait_login", $instance); _load_instance("tests/_console_wait_login", $instance);
_load_instance("tests/_snapshot_only") if (get_var("LOGIN_SNAPSHOT"));
} }
} }

2
templates.fif.json
View File

@ -2594,7 +2594,7 @@
"+START_AFTER_TEST": "server_cockpit_default", "+START_AFTER_TEST": "server_cockpit_default",
"BOOTFROM": "c", "BOOTFROM": "c",
"LOGIN_SNAPSHOT": "1", "LOGIN_SNAPSHOT": "1",
"POSTINSTALL": "server_cockpit_updates server_cockpit_autoupdate", "POSTINSTALL": "_cockpit_setup server_cockpit_updates server_cockpit_autoupdate",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"USER_LOGIN": "false" "USER_LOGIN": "false"
} }

2
tests/_snapshot_only.pm → tests/_cockpit_setup.pm
View File

@ -5,6 +5,8 @@ use utils;
sub run { sub run {
my $self = shift; my $self = shift;
# for update testing, ensure the update repos are set up
repo_setup if (get_var("ADVISORY_OR_TASK"));
} }
sub test_flags { sub test_flags {