From 5c784e22cc0f8c14990c07ea4c8ffd37a5d34782 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 20 Nov 2019 18:56:06 -0800 Subject: [PATCH] Skip post-install actions for VNC client installs ...otherwise the VNC client tests fail on aarch64 because we try to apply the 'console=tty0' workaround for #1661288. Fortunately we don't really need that for the VNC install test to work, so let's just skip it. We can make this more sophisticated later if it turns out to be necessary. Signed-off-by: Adam Williamson --- tests/_do_install_and_reboot.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm index 91e58843..6833e0ac 100644 --- a/tests/_do_install_and_reboot.pm +++ b/tests/_do_install_and_reboot.pm @@ -139,6 +139,10 @@ sub run { # for lives is unreliable. And if we're already doing something # else at a console, we may as well reboot from there too push (@actions, 'reboot') if (!get_var("MEMCHECK") && (get_var("LIVE") || @actions)); + # our approach for taking all these actions doesn't work on VNC + # installs, fortunately we don't need any of them in that case + # yet, so for now let's just flush the list here if we're VNC + @actions = () if (get_var("VNC_CLIENT")); # If we have no actions, let's just go ahead and reboot now, # unless this is memcheck unless (@actions) {