Commit dfcea746 authored by Jonathan Riddell's avatar Jonathan Riddell 🛶

revert to last known good openqa runs version e89283fb

parent 9f9ce3ab
......@@ -188,10 +188,6 @@ sub bootloader {
# When it is grub we need to hit enter to proceed.
assert_screen 'bootloader', 60;
if (match_has_tag('live-bootloader-uefi')) {
if (testapi::get_var("INSTALLATION_OEM")) {
send_key 'down';
assert_screen('live-bootloader-uefi-oem');
}
# Hack to force kmsg onto ttyS1 to debug shutdown problems. This hack
# can be dropped once neon properly shuts down all the time again!
# Edits grub entry to add more kernel cmdlines.
......@@ -207,13 +203,19 @@ sub bootloader {
}
send_key 'end';
foreach my $i (0..25) {
send_key 'left';
}
send_key 'left';
send_key 'left';
send_key 'left';
# Set the kmsg target to ttyS1. We then also need to force plymouth as
# it'd not do anything if console= is set.
type_string 'console=ttyS1 plymouth.force-splash plymouth.ignore-show-splash plymouth.ignore-serial-consoles ';
send_key 'ctrl-x';
if (testapi::get_var("INSTALLATION_OEM")) {
send_key 'down';
assert_screen('live-bootloader-uefi-oem');
}
send_key 'ret';
}
}
......
{
"area": [
{
"height": 29,
"match": 90,
"type": "match",
"width": 84,
"xpos": 817,
"ypos": 520
}
],
"properties": [],
"tags": [
"installer-next",
"ENV-SERIES-bionic"
]
}
{
"area": [
{
"height": 308,
"match": 95,
"type": "match",
"width": 758,
"xpos": 156,
"ypos": 0
}
],
"properties": [],
"tags": [
"oem-installer-user-complete",
"ENV-SERIES-bionic"
]
}
{
"area": [
{
"height": 318,
"match": 95,
"type": "match",
"width": 914,
"xpos": 0,
"ypos": 0
}
],
"properties": [],
"tags": [
"oem-installer-user",
"ENV-SERIES-bionic"
]
}
{
"area": [
{
"height": 562,
"height": 563,
"match": 95,
"type": "match",
"width": 884,
"xpos": 30,
"ypos": 1
"width": 914,
"xpos": 0,
"ypos": 0
}
],
"properties": [],
......@@ -14,4 +14,3 @@
"oem-installer-welcome"
]
}
......@@ -82,12 +82,12 @@ sub run {
}
assert_screen "oem-installer-user", 16;
assert_screen "oem-installer-user-complete", 16;
# We are in the password field already. Username is oem by default
type_string get_var("OEM_PASSWORD");
send_key "tab", 1; # 2nd password field
type_string get_var("OEM_PASSWORD");
# all fields filled (not matching hostname field)
assert_screen "oem-installer-user-complete", 16;
assert_and_click "installer-next";
assert_screen "installer-show", 10;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment