testing/os-autoinst-distri-rocky
11
0
Fork 0
mirror of https://github.com/rocky-linux/os-autoinst-distri-rocky.git synced 2024-11-22 05:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try a different way of disabling root/user on Workstation live

Browse Source 
Sigh, 'overloaded' product templates like that don't quite work.
So, let's try doing it a different way, in main.pm.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-03-08 18:42:09 -08:00
parent 7c28cfc909
commit 7ab3debd77
2 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.pm
View File

@ -142,6 +142,15 @@ sub load_install_tests() {
# if this is a kickstart install, that's all folks # if this is a kickstart install, that's all folks
return if (get_var("KICKSTART")); return if (get_var("KICKSTART"));
# on Fedora 28+, root password and user creation spokes are
# suppressed on Workstation live install, so we do not want to
# try and use them. However we're also still testing F27 live
# respins, so we can't just do this in the templates yet, sadly.
if (get_var('LIVE') && get_var('DESKTOP') eq 'gnome') {
set_var('ROOT_PASSWORD', 'false');
set_var('USER_LOGIN', 'false');
}
if (get_var('ANACONDA_TEXT')) { if (get_var('ANACONDA_TEXT')) {
# since it differs much, handle text installation separately # since it differs much, handle text installation separately
autotest::loadtest "tests/install_text.pm"; autotest::loadtest "tests/install_text.pm";

34
templates
View File

@ -4273,21 +4273,6 @@
], ],
version => "*", version => "*",
}, },
{
arch => "x86_64",
distri => "fedora",
flavor => "Workstation-live-iso",
name => "",
settings => [
{ key => "LIVE", value => "1" },
{ key => "PACKAGE_SET", value => "default" },
{ key => "DESKTOP", value => "gnome" },
{ key => "TEST_TARGET", value => "ISO" },
{ key => "ROOT_PASSWORD", => "false" },
{ key => "USER_LOGIN", => "false" }
],
version => "*",
},
{ {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
@ -4299,7 +4284,7 @@
{ key => "DESKTOP", value => "gnome" }, { key => "DESKTOP", value => "gnome" },
{ key => "TEST_TARGET", value => "ISO" } { key => "TEST_TARGET", value => "ISO" }
], ],
version => "27", version => "*",
}, },
{ {
arch => "x86_64", arch => "x86_64",
@ -4365,21 +4350,6 @@
], ],
version => "*", version => "*",
}, },
{
arch => "i386",
distri => "fedora",
flavor => "Workstation-live-iso",
name => "",
settings => [
{ key => "LIVE", value => "1" },
{ key => "PACKAGE_SET", value => "default" },
{ key => "DESKTOP", value => "gnome" },
{ key => "TEST_TARGET", value => "ISO" },
{ key => "ROOT_PASSWORD", => "false" },
{ key => "USER_LOGIN", => "false" }
],
version => "*",
},
{ {
arch => "i386", arch => "i386",
distri => "fedora", distri => "fedora",
@ -4391,7 +4361,7 @@
{ key => "DESKTOP", value => "gnome" }, { key => "DESKTOP", value => "gnome" },
{ key => "TEST_TARGET", value => "ISO" } { key => "TEST_TARGET", value => "ISO" }
], ],
version => "27", version => "*",
}, },
{ {
arch => "i386", arch => "i386",