srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-25 07:13:09 +00:00
Code Issues Releases Activity

Make some changes.

Browse Source
This commit is contained in:
Lukáš Růžička 2024-11-20 12:58:11 +01:00
parent f8f0bb031d
commit f5a40aa06b
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/tapnet.pm
View File

@ -29,6 +29,14 @@ sub setup_tap_static {
# this is a common thing for tap tests, where we set up networking # this is a common thing for tap tests, where we set up networking
# for the system with a static IP address and possibly a specific # for the system with a static IP address and possibly a specific
# hostname # hostname
# It seems that this counts on being on root console,
# however, if we are not there, switch first.
my $console = 0;
unless (check_screen("root_console")) {
$console = 1;
$self->root_console(tty => 3);
}
my $ip = shift; my $ip = shift;
my $hostname = shift || ""; my $hostname = shift || "";
if ($hostname) { if ($hostname) {
@ -53,6 +61,10 @@ sub setup_tap_static {
assert_script_run "nmcli con up '$connection'"; assert_script_run "nmcli con up '$connection'";
# for debugging # for debugging
assert_script_run "nmcli -t con show '$connection'"; assert_script_run "nmcli -t con show '$connection'";
# If we have switched here from graphics, go back there.
if ($console) {
desktop_vt();
}
} }
sub get_host_dns { sub get_host_dns {

4
templates.fif.json
View File

@ -2524,7 +2524,7 @@
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"NICTYPE": "tap", "NICTYPE": "tap",
"POSTINSTALL": "remote_desktop_server", "POSTINSTALL": "remote_desktop_server",
"POST_STATIC": "172.16.2.107 kaermorhen.test.openqa.fedoraproject.org", "POST_STATIC": "172.16.2.177 kaermorhen.test.openqa.fedoraproject.org",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
"WORKER_CLASS": "tap" "WORKER_CLASS": "tap"
@ -2540,7 +2540,7 @@
"NICTYPE": "tap", "NICTYPE": "tap",
"POSTINSTALL": "remote_desktop_freerdp", "POSTINSTALL": "remote_desktop_freerdp",
"PARALLEL_WITH": "remote_desktop_server", "PARALLEL_WITH": "remote_desktop_server",
"POST_STATIC": "172.16.2.108 witcher.test.openqa.fedoraproject.org", "POST_STATIC": "172.16.2.178 witcher.test.openqa.fedoraproject.org",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
"WORKER_CLASS": "tap" "WORKER_CLASS": "tap"

2
tests/remote_desktop_freerdp.pm
View File

@ -24,7 +24,7 @@ sub run {
# Open terminal and make a connection to the remote server. # Open terminal and make a connection to the remote server.
menu_launch_type("terminal"); menu_launch_type("terminal");
wait_still_screen(3); wait_still_screen(3);
enter_cmd("xfreerdp /:u $user /:p $password /:v $ip"); enter_cmd("xfreerdp /:u $rdpuser /:p $rdppass /:v $ip");
# Check that a connection window has appeared. # Check that a connection window has appeared.
assert_screen("connection_window"); assert_screen("connection_window");