Commit d85841ad authored by Harald Sitter's avatar Harald Sitter

fully port away from xenial

the tests were somewhat forgotten when killing off xenial as they all
are forwards and backwards compatible. seeing as xenial is no more
we can also drop special workarounds done for it though.

- all ENV fallbacks are gone
- all conditionals in the test WRT bionic vs. xenial are gone and bionic
  is now the unconditional default expectation
parent 686b0061
env.DIST = 'xenial'
env.DIST = 'bionic'
env.PWD_BIND = '/workspace'
if (env.TYPE == null) {
......@@ -16,10 +16,6 @@ if (env.TYPE == null) {
error 'TYPE param not set. Cannot run install test without a type.'
}
if (env.OPENQA_SERIES == null) {
env.OPENQA_SERIES = 'xenial'
}
// WARNING: DO NOT set properites()!
// properties() calls override whatever we set in the XML via our tooling
// templates. That is to say: calling properties() overrides the actual
......
env.DIST = 'xenial'
env.DIST = 'bionic'
env.PWD_BIND = '/workspace'
env.TYPE = 'useredition' // FIXME: hardcoded for now
......@@ -17,10 +17,6 @@ if (env.TYPE == null) {
error 'TYPE param not set. Cannot run install test without a type.'
}
if (env.OPENQA_SERIES == null) {
env.OPENQA_SERIES = 'xenial'
}
// WARNING: these override the XML configs when run!
properties([
disableConcurrentBuilds(),
......
env.DIST = 'xenial'
env.DIST = 'bionic'
env.PWD_BIND = '/workspace'
if (env.TYPE == null) {
......
......@@ -21,7 +21,7 @@
require 'tty/command'
OPENQA_SERIES = ENV.fetch('OPENQA_SERIES', 'xenial')
OPENQA_SERIES = ENV.fetch('OPENQA_SERIES')
TYPE = ENV.fetch('TYPE')
# Both rsync and tar have the same exclude arg syntax \o/
EXCLUSION_ARGS = %w[
......
......@@ -41,9 +41,6 @@ DISK_SIZE_GB = '30'.freeze
ENV['PERL5LIB'] = PERL5LIB
# Default to xenial unless otherwise specified.
ENV['OPENQA_SERIES'] = 'xenial' unless ENV['OPENQA_SERIES']
puts 'kvm-ok?'
system 'kvm-ok'
system 'ls -lah /dev/kvm'
......
......@@ -56,15 +56,11 @@ sub init_consoles {
$self->add_console('root-virtio-terminal', 'virtio-terminal', {});
# NB: ubuntu only sets up tty1 to 7 by default.
$self->add_console('log-console', 'tty-console', {tty => 6});
if (get_var('OPENQA_SERIES') eq 'xenial') {
print("init_consoles :: XENIAL\n");
$self->add_console('x11', 'tty-console', {tty => 7});
} else {
print("init_consoles :: !XENIAL\n");
# in bionic ubuntu switched to tty1 for default. we adjusted our sddm
# accordingly.
$self->add_console('x11', 'tty-console', {tty => 1});
}
# in bionic ubuntu switched to tty1 for default. we adjusted our sddm
# accordingly.
$self->add_console('x11', 'tty-console', {tty => 1});
# oem-config runs on tty1, later it will drop into tty7 for the final
# x11.
$self->add_console('oem-config', 'tty-console', {tty => 1});
......
......@@ -43,11 +43,9 @@ sub run {
# Make sure the evdev driver is installed. We prefer evdev at this time
# instead of libinput since our KCMs aren't particularly awesome for
# libinput.
if (get_var('OPENQA_SERIES') ne 'xenial') {
assert_script_run 'dpkg -s xserver-xorg-input-evdev';
validate_script_output 'grep -e "Using input driver" /var/log/Xorg.0.log',
sub { m/.+evdev.+/ };
}
assert_script_run 'dpkg -s xserver-xorg-input-evdev';
validate_script_output 'grep -e "Using input driver" /var/log/Xorg.0.log',
sub { m/.+evdev.+/ };
# Assert that we have no preinstalled pool lingering around on the installed
# rootfs. preinstalled-pool comes from our livecd-rootfs-neon fork and
......
......@@ -52,11 +52,8 @@ sub run {
type_string 'frenchfries';
assert_and_click "installer-next";
# bionic version of ubiquity moved the keyboard configuration as first step
if (testapi::get_var('OPENQA_SERIES') ne 'xenial') {
assert_screen 'installer-keyboard', 16;
assert_and_click 'installer-next';
}
assert_screen 'installer-keyboard', 16;
assert_and_click 'installer-next';
assert_screen "installer-prepare", 16;
assert_and_click "installer-next";
......@@ -74,13 +71,6 @@ sub run {
assert_screen "installer-timezone", 60;
assert_and_click "installer-next";
# bionic version of ubiquity moved the keyboard configuration as first step
# while in xenial version the keyboard config is after timezone setup
if (testapi::get_var('OPENQA_SERIES') eq 'xenial') {
assert_screen 'installer-keyboard', 16;
assert_and_click 'installer-next';
}
assert_screen "oem-installer-user", 16;
# We are in the password field already. Username is oem by default
type_string get_var("OEM_PASSWORD");
......@@ -141,22 +131,12 @@ sub run {
assert_and_click "installer-next";
# bionic version of ubiquity moved the keyboard configuration as first step
if (testapi::get_var('OPENQA_SERIES') ne 'xenial') {
assert_screen 'oem-config-keyboard', 16;
assert_and_click 'installer-next';
}
assert_screen 'oem-config-keyboard', 16;
assert_and_click 'installer-next';
assert_screen 'oem-config-timezone';
assert_and_click "installer-next";
# bionic version of ubiquity moved the keyboard configuration as first step
# while in xenial version the keyboard config is after timezone setup
if (testapi::get_var('OPENQA_SERIES') eq 'xenial') {
assert_screen 'oem-config-keyboard', 16;
assert_and_click 'installer-next';
}
assert_screen "oem-config-user", 16;
type_string $user;
# user in user field, name field (needle doesn't include hostname in match)
......
......@@ -30,7 +30,7 @@ sub assert_keyboard_page {
# this is a problem because we need english keyboard maps to do input
# via openqa. So, once we've asserted the default keyboard page, change it
# to use english instead.
if (match_has_tag('installer-keyboard-espanol') && get_var('OPENQA_SERIES') ne 'xenial') {
if (match_has_tag('installer-keyboard-espanol')) {
# Open the combobox
assert_and_click 'installer-keyboard';
# Jump close to english (ingles).
......@@ -86,11 +86,6 @@ sub install {
}
assert_and_click "installer-next";
# bionic version of ubiquity moved the keyboard configuration as first step
if (testapi::get_var('OPENQA_SERIES') ne 'xenial') {
assert_keyboard_page;
}
assert_screen "installer-prepare", 16;
assert_and_click "installer-next";
if ($args{disk_empty}) {
......@@ -113,11 +108,7 @@ sub install {
assert_screen "installer-timezone", 60;
assert_and_click "installer-next";
# bionic version of ubiquity moved the keyboard configuration as first step
# while in xenial version the keyboard config is after timezone setup
if (testapi::get_var('OPENQA_SERIES') eq 'xenial') {
assert_keyboard_page;
}
assert_keyboard_page;
assert_screen "installer-user", 16;
type_string $user;
......
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