Skip to content

Commit 0b27689

Browse files
authored
Merge pull request os-autoinst#22280 from ilmanzo/poo183134_serial_el4
Use serial terminal instead of root console in eal4
2 parents 9416ff2 + a485e2c commit 0b27689

13 files changed

+32
-15
lines changed

schedule/security/cc_eal4.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: >
33
This is for EAL4 tests
44
schedule:
55
- installation/bootloader_start
6-
- security/boot_disk
6+
- boot/boot_to_desktop
77
- security/eal4/setup_eal4_env
88
- '{{disable_root_ssh}}'
99
- security/eal4/accessible_network_interface

tests/security/eal4/accessible_network_interface.pm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ use testapi;
1414
use utils;
1515
use eal4_test;
1616
use Data::Dumper;
17+
use serial_terminal 'select_serial_terminal';
1718

1819
sub run {
1920
my ($self) = shift;
2021

21-
select_console 'root-console';
22+
select_serial_terminal;
2223

2324
# The result of 'lsof -i -P' likes:
2425
# COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME

tests/security/eal4/check_processor_vulnerability_mitigations.pm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ use testapi;
1414
use utils;
1515
use eal4_test;
1616
use Utils::Architectures;
17+
use serial_terminal 'select_serial_terminal';
1718

1819
sub run {
1920
my ($self) = shift;
2021

21-
select_console 'root-console';
22+
select_serial_terminal;
2223

2324
my $script = 'spectre-meltdown-checker.sh';
2425
my $log_file = 'spectre-meltdown-checker.log';

tests/security/eal4/check_undocumented_security_programs.pm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ use strict;
1212
use warnings;
1313
use testapi;
1414
use utils;
15+
use serial_terminal 'select_serial_terminal';
1516

1617
sub run {
1718
my ($self) = shift;
1819

19-
select_console 'root-console';
20+
select_serial_terminal;
2021

2122
# The programs are defined by the FSP and corresponding man pages
2223
my $known_programs = {

tests/security/eal4/chrony_pid_file.pm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ use strict;
1212
use warnings;
1313
use testapi;
1414
use utils;
15+
use serial_terminal 'select_serial_terminal';
1516

1617
sub run {
1718
my ($self) = shift;
1819

19-
select_console 'root-console';
20+
select_serial_terminal;
2021

2122
# The chrony pid file does not exist is the expected result
2223
if (script_run('find / -name "*chrony*" | grep \'\\.pid\'') == 0) {

tests/security/eal4/dbus_fuzzer.pm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ use utils;
1515
use eal4_test;
1616
use Mojo::Util 'trim';
1717
use Data::Dumper;
18+
use serial_terminal 'select_serial_terminal';
1819

1920
sub run {
2021
my ($self) = shift;
2122

22-
select_console 'root-console';
23+
select_serial_terminal;
2324

2425
# Install the required packages
2526
zypper_call('in glib2-devel libffi-devel');

tests/security/eal4/dbus_services_exposure.pm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ use eal4_test;
1616
use Data::Dumper;
1717
use version_utils 'is_sle';
1818
use Utils::Architectures 'is_s390x';
19+
use serial_terminal 'select_serial_terminal';
1920

2021
# List of known safe processes that can have DBus services
2122
my @allowed_processes = qw(
@@ -73,7 +74,7 @@ sub is_dynamic_name {
7374

7475
sub run {
7576
my ($self) = shift;
76-
select_console 'root-console';
77+
select_serial_terminal;
7778

7879
# Run the test
7980
my $output_dbus_send = script_output('/bin/dbus-send --system --print-reply --dest=org.freedesktop.DBus --type=method_call /org/freedesktop/DBUS org.freedesktop.DBus.ListNames');

tests/security/eal4/drng_test_preparation.pm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ use warnings;
1313
use testapi;
1414
use utils;
1515
use eal4_test;
16+
use serial_terminal 'select_serial_terminal';
1617

1718
sub run {
1819
my ($self) = shift;
1920

20-
select_console 'root-console';
21+
select_serial_terminal;
2122

2223
# Install the required packages
2324
zypper_call('in libopenssl-devel libgcrypt-devel');
2425

2526
my $test_dir = '/root/eval/drng';
26-
# Complile gather_random_data
27+
# Compile gather_random_data
2728
my $exe_file = 'gather_random_data';
2829
assert_script_run("cd $eal4_test::code_dir");
2930
assert_script_run("gcc -o $exe_file -lcrypto -lssl -lgcrypt gather_random_data.c");

tests/security/eal4/kvm_check.pm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ use strict;
1212
use warnings;
1313
use testapi;
1414
use utils;
15+
use serial_terminal 'select_serial_terminal';
1516

1617
sub run {
1718
my ($self) = shift;
1819

19-
select_console 'root-console';
20+
select_serial_terminal;
2021

2122
# Install the required packages
2223
zypper_call('in libvirt');

tests/security/eal4/netlink_message.pm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ use strict;
1212
use warnings;
1313
use testapi;
1414
use utils;
15+
use serial_terminal 'select_serial_terminal';
1516

1617
sub run {
1718
my ($self) = shift;
1819

19-
select_console 'root-console';
20+
select_serial_terminal;
2021

2122
# Complile
2223
assert_script_run('cd /usr/local/eal4/pentest/netlink');

0 commit comments

Comments
 (0)