srbala
/
os-autoinst-distri-fedora
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
1
0
Fork 0
Code Issues Releases Activity

Simplified the templates

This commit is contained in:
Josef Skladanka 2015-02-04 14:05:20 +01:00
parent 23aee07c68
commit 475fcc0d19
4 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.pm
View File

@ -43,15 +43,15 @@ else
## Disk partitioning
if (get_var('DISK_GUIDED_EMPTY')){
autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_empty.pm";
}
elsif (get_var('DISK_GUIDED_MULTI')){
if (get_var('DISK_GUIDED_MULTI')){
autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_multi.pm";
}
elsif (get_var('DISK_GUIDED_DELETE_ALL')){
autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_delete_all.pm";
}
else {
autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_empty.pm";
}
# Start installation, set user & root passwords, reboot
autotest::loadtest get_var('CASEDIR')."/tests/_do_install_and_reboot.pm";

27
templates
View File

@ -41,9 +41,7 @@
{
name => "server_simple",
prio => 1,
settings => [
{ key => "DISK_GUIDED_EMPTY", value => "1" },
],
settings => [],
variables => "",
},
{
@ -54,7 +52,6 @@
{ key => "HDDMODEL", value => "ide-hd,bus=ahci0.0" },
{ key => "NUMDISKS", value => "2" },
{ key => "HDD_2". value => "disk_full.img" },
{ key => "DO_LOGIN". value => "1" },
{ key => "ROOT_PASSWORD". value => "weakpassword" },
],
variables => "",
@ -64,7 +61,7 @@
prio => 3,
settings => [
{ key => "BOOT_UPDATES_IMG_URL", value => "1" },
{ key => "DISK_GUIDED_EMPTY", value => "1" },
{ key => "GRUB", value => "inst.updates=https://fedorapeople.org/groups/qa/updates/updates-unipony.img" },
{ key => "HDDMODEL", value => "virtio-scsi-pci" },
],
variables => "",
@ -74,8 +71,7 @@
prio => 4,
settings => [
{ key => "KICKSTART", value => "1" },
{ key => "BOOT_KICKSTART_HTTP", value => "1" },
{ key => "DO_LOGIN", value => "1" },
{ key => "GRUB", value => "inst.ks=http://jskladan.fedorapeople.org/kickstarts/root-user-crypted-net.ks" },
{ key => "USER_LOGIN", value => "test" },
{ key => "USER_PASSWORD", value => "test" },
{ key => "ROOT_PASSWORD", value => "111111" },
@ -88,10 +84,25 @@
settings => [
{ key => "DISK_GUIDED_DELETE_ALL", value => "1" },
{ key => "HDDMODEL", value => "ide-hd" },
{ key => "HDDVERSION", value => "Full disk" },
{ key => "HDD_1", value => "disk_full.img" },
],
variables => "",
},
{
name => "server_mirrorlist_graphical",
prio => 6,
settings => [
{ key => "MIRRORLIST_GRAPHICAL", value => "1" },
],
variables => "",
},
{
name => "server_repository_http_graphical",
prio => 7,
settings => [
{ key => "REPOSITORY_GRAPHICAL", value => "1" },
],
variables => "",
},
],
}

24
tests/_boot_to_anaconda.pm
View File

@ -13,25 +13,15 @@ sub run {
send_key "up";
}
if ( get_var("KICKSTART") )
{
if ( get_var("BOOT_KICKSTART_HTTP") )
{
send_key "tab";
type_string " inst.ks=http://jskladan.fedorapeople.org/kickstarts/root-user-crypted-net.ks";
}
send_key "ret";
if( get_var("GRUB")){
send_key "tab";
type_string " ".get_var("GRUB");
}
else
{
if ( get_var("BOOT_UPDATES_IMG_URL") )
{
send_key "tab";
type_string " inst.updates=https://fedorapeople.org/groups/qa/updates/updates-unipony.img";
}
send_key "ret";
send_key "ret";
unless (get_var("KICKSTART"))
{
# Select install language
assert_screen "anaconda_select_install_lang", 300;
type_string "english";

2
tests/_wait_for_login_screen.pm
View File

@ -11,7 +11,7 @@ sub run {
# Reboot and wait for the text login
assert_screen "clean_install_login", $wait_time;
if (get_var("DO_LOGIN"))
if ((get_var("USER_LOGIN") && get_var("USER_PASSWORD")) || get_var("ROOT_PASSWORD"))
{
if (get_var("FLAVOR") eq "server")
{