testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Tweak IoT initial-setup handling (only on F31)

Browse Source 
initial-setup doesn't appear on IoT F32+, so we shouldn't expect
it.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-02-20 08:38:50 -08:00
parent deab03a80d
commit 2e6cf6453d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates.fif.json
View File

@ -140,7 +140,6 @@
"settings": { "settings": {
"CANNED": "1", "CANNED": "1",
"PACKAGE_SET": "default", "PACKAGE_SET": "default",
"CONSOLE_INITIAL_SETUP": "1",
"TEST_TARGET": "ISO" "TEST_TARGET": "ISO"
}, },
"version": "*" "version": "*"
@ -152,7 +151,6 @@
"settings": { "settings": {
"CANNED": "1", "CANNED": "1",
"PACKAGE_SET": "default", "PACKAGE_SET": "default",
"CONSOLE_INITIAL_SETUP": "1",
"TEST_TARGET": "ISO" "TEST_TARGET": "ISO"
}, },
"version": "*" "version": "*"

7
tests/_console_wait_login.pm
View File

@ -15,10 +15,11 @@ sub run {
$wait_time = 180; $wait_time = 180;
} }
# handle initial-setup, if we're expecting it (the variable is set # handle initial-setup, if we're expecting it (IoT < F32 install test)
# and this is an install test)
my $testname = get_var("TEST"); my $testname = get_var("TEST");
if (get_var("CONSOLE_INITIAL_SETUP") && index($testname, 'install') != -1) { my $subvariant = get_var("SUBVARIANT");
my $version = get_release_number;
if ($subvariant eq "IoT" && $version < 32 && index($testname, 'install') != -1) {
assert_screen "console_initial_setup", $wait_time; assert_screen "console_initial_setup", $wait_time;
type_string "q\n"; type_string "q\n";
type_string "yes\n"; type_string "yes\n";