From 7f75a35bfdb9328a1eb7337abe7735004f34c5a1 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 8 Nov 2024 08:29:04 -0800 Subject: [PATCH] Remove VNC install tests VNC is gone in current Rawhide. As F41 is released now, we won't hit these tests any more anywhere where they might work (we don't get a Server DVD image for respins), so let's just drop the tests. Signed-off-by: Adam Williamson --- templates.fif.json | 63 --------------------------- tests/_vnc_client_connect.pm | 28 ------------ tests/_vnc_client_connect_pre.pm | 26 ----------- tests/_vncconnect_client_setup.pm | 22 ---------- tests/_vncconnect_client_setup_pre.pm | 25 ----------- 5 files changed, 164 deletions(-) delete mode 100644 tests/_vnc_client_connect.pm delete mode 100644 tests/_vnc_client_connect_pre.pm delete mode 100644 tests/_vncconnect_client_setup.pm delete mode 100644 tests/_vncconnect_client_setup_pre.pm diff --git a/templates.fif.json b/templates.fif.json index f23e364b..82f02218 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -2244,69 +2244,6 @@ "WORKER_CLASS": "tap" } }, - "install_vnc_client": { - "profiles": { - "fedora-Server-dvd-iso-aarch64-*-aarch64": 40, - "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40, - "fedora-Server-dvd-iso-x86_64-*-64bit": 40 - }, - "settings": { - "BOOTFROM": "c", - "DESKTOP": "gnome", - "HDD_1": "disk_f%CURRREL%_desktop_5_%ARCH%.qcow2", - "INSTALL": "1", - "NICTYPE": "tap", - "PARALLEL_WITH": "install_vnc_server", - "PREINSTALL": "_vnc_client_connect_pre _graphical_wait_login _vnc_client_connect", - "VNC_CLIENT": "1", - "WORKER_CLASS": "tap" - } - }, - "install_vnc_server": { - "profiles": { - "fedora-Server-dvd-iso-aarch64-*-aarch64": 40, - "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40, - "fedora-Server-dvd-iso-x86_64-*-64bit": 40 - }, - "settings": { - "GRUB": "inst.vnc net.ifnames=0 biosdevname=0 ip=172.16.2.114::172.16.2.2:255.255.255.0:vnc001.test.openqa.fedoraproject.org:eth0:off", - "NICTYPE": "tap", - "VNC_SERVER": "1", - "WORKER_CLASS": "tap" - } - }, - "install_vncconnect_client": { - "profiles": { - "fedora-Server-dvd-iso-aarch64-*-aarch64": 40, - "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40, - "fedora-Server-dvd-iso-x86_64-*-64bit": 40 - }, - "settings": { - "BOOTFROM": "c", - "DESKTOP": "gnome", - "HDD_1": "disk_f%CURRREL%_desktop_5_%ARCH%.qcow2", - "INSTALL": "1", - "NICTYPE": "tap", - "PREINSTALL": "_vncconnect_client_setup_pre _graphical_wait_login _vncconnect_client_setup", - "VNC_CLIENT": "1", - "WORKER_CLASS": "tap" - } - }, - "install_vncconnect_server": { - "profiles": { - "fedora-Server-dvd-iso-aarch64-*-aarch64": 40, - "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40, - "fedora-Server-dvd-iso-x86_64-*-64bit": 40 - }, - "settings": { - "GRUB": "inst.vnc inst.vncconnect=172.16.2.117:5500 net.ifnames=0 biosdevname=0 ip=172.16.2.116::172.16.2.2:255.255.255.0:vnc003.test.openqa.fedoraproject.org:eth0:off", - "INSTALL_UNLOCK": "vncconnect_client_ready", - "NICTYPE": "tap", - "PARALLEL_WITH": "install_vncconnect_client", - "VNC_SERVER": "1", - "WORKER_CLASS": "tap" - } - }, "install_xfs": { "profiles": { "fedora-Server-dvd-iso-aarch64-*-aarch64": 40, diff --git a/tests/_vnc_client_connect.pm b/tests/_vnc_client_connect.pm deleted file mode 100644 index 1ce73c6c..00000000 --- a/tests/_vnc_client_connect.pm +++ /dev/null @@ -1,28 +0,0 @@ -use base "installedtest"; -use strict; -use testapi; -use utils; - -sub run { - menu_launch_type('vinagre'); - assert_and_click('vinagre_new_connection'); - assert_and_click('vinagre_protocol'); - assert_and_click('vinagre_protocol_vnc'); - send_key('tab'); - type_very_safely("172.16.2.114:5901\n"); - # this panel likes to move around so make sure we really hit it - while (check_screen 'vinagre_enable_shortcuts') { - assert_and_click('vinagre_enable_shortcuts'); - sleep 2; - } - assert_and_click('grant_access'); - assert_and_click('vinagre_fullscreen'); -} - -sub test_flags { - return {fatal => 1}; -} - -1; - -# vim: set sw=4 et: diff --git a/tests/_vnc_client_connect_pre.pm b/tests/_vnc_client_connect_pre.pm deleted file mode 100644 index 086bc8bf..00000000 --- a/tests/_vnc_client_connect_pre.pm +++ /dev/null @@ -1,26 +0,0 @@ -use base "installedtest"; -use strict; -use tapnet; -use testapi; -use utils; - -sub run { - my $self = shift; - boot_to_login_screen(timeout => 300); - $self->root_console(tty => 3); - setup_tap_static('172.16.2.115', 'vnc002.test.openqa.fedoraproject.org'); - # test test: check if we can see the server - assert_script_run "ping -c 2 172.16.2.114"; - # FIXME Connections is now in the default install, we should - # switch this test to using that - assert_script_run "dnf -y install vinagre", 180; - desktop_vt; -} - -sub test_flags { - return {fatal => 1}; -} - -1; - -# vim: set sw=4 et: diff --git a/tests/_vncconnect_client_setup.pm b/tests/_vncconnect_client_setup.pm deleted file mode 100644 index 2bba5742..00000000 --- a/tests/_vncconnect_client_setup.pm +++ /dev/null @@ -1,22 +0,0 @@ -use base "installedtest"; -use strict; -use lockapi; -use testapi; -use utils; - -sub run { - my $self = shift; - desktop_launch_terminal; - assert_screen "apps_run_terminal"; - wait_still_screen 5; - type_very_safely "vncviewer -FullScreen -listen\n"; - mutex_create 'vncconnect_client_ready'; -} - -sub test_flags { - return {fatal => 1}; -} - -1; - -# vim: set sw=4 et: diff --git a/tests/_vncconnect_client_setup_pre.pm b/tests/_vncconnect_client_setup_pre.pm deleted file mode 100644 index cc64a4e6..00000000 --- a/tests/_vncconnect_client_setup_pre.pm +++ /dev/null @@ -1,25 +0,0 @@ -use base "installedtest"; -use strict; -use tapnet; -use testapi; -use utils; - -sub run { - my $self = shift; - boot_to_login_screen(timeout => 300); - $self->root_console(tty => 3); - setup_tap_static('172.16.2.117', 'vnc004.test.openqa.fedoraproject.org'); - # install tigervnc (Boxes doesn't do reverse VNC) - assert_script_run "dnf -y install tigervnc", 180; - # take down the firewall - assert_script_run "systemctl stop firewalld"; - desktop_vt; -} - -sub test_flags { - return {fatal => 1}; -} - -1; - -# vim: set sw=4 et: