Skip to content

Commit

Permalink
Merge remote-tracking branch 'wayne/wayne/bsc#1231522_sles15sp7_offli…
Browse files Browse the repository at this point in the history 
…ne_upgrade_remove_rebootnow' into aarch64/grub
  • Loading branch information
@RoyCai7
RoyCai7 committed Dec 3, 2024
2 parents b34d2c9 + 9245574 commit 3c85738
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 54 deletions.
2 changes: 2 additions & 0 deletions tests/installation/disable_grub_timeout.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ sub run {
# SLE-12 GA only accepts positive integers in range [0,300]
$timeout = "60" if is_sle('<12-SP1');
$timeout = "90" if (get_var("REGRESSION", '') =~ /xen|kvm|qemu/);
# Migrate 12-SP5 to 15-SP7 on aarch64
$timeout = "30" if (check_var('BASE_PRODUCT', 'sles-12-sp5') && get_var('VIRT_PRJ2_HOST_UPGRADE') && is_aarch64);
type_string $timeout;

wait_still_screen(1);
Expand Down
72 changes: 20 additions & 52 deletions tests/virt_autotest/login_console.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ sub login_to_console {
}

my @bootup_needles = is_ipxe_boot ? qw(grub2) : qw(grub2 grub1 prague-pxe-menu);
unless (is_tumbleweed or check_screen(\@bootup_needles, get_var('AUTOYAST') && !get_var("NOT_DIRECT_REBOOT_AFTER_AUTOYAST") ? 1 : 180)) {
unless (get_var('UPGRADE_AFTER_REBOOT') or is_tumbleweed or check_screen(\@bootup_needles, get_var('AUTOYAST') && !get_var("NOT_DIRECT_REBOOT_AFTER_AUTOYAST") ? 1 : 180)) {
ipmitool("chassis power reset");
reset_consoles;
select_console 'sol', await_console => 0;
Expand Down Expand Up @@ -187,60 +187,28 @@ sub login_to_console {
save_screenshot;
#offline upgrade requires upgrading offline during reboot while online doesn't
if (get_var('OFFLINE_UPGRADE')) {
#boot to upgrade menuentry
send_key 'down';
send_key 'ret';
#wait sshd up
die "Can not connect to machine to perform offline upgrade via ssh" unless (check_port_state(get_required_var('SUT_IP'), 22, 10));
save_screenshot;
#switch to ssh console
use_ssh_serial_console;
save_screenshot;
#start upgrade
if (check_var('VIDEOMODE', 'text')) {
if (lc(get_var('VERSION_TO_INSTALL', '')) eq '12-sp5' and lc(get_var('UPGRADE_PRODUCT', '')) =~ /sles-15-sp[67]/) {
# DISPLAY= might be culprit that prevents host upgrade from proceeding at SCC registration. Please refer to bsc#1218798.
record_soft_failure("bsc#1218798 - [SLES][15-SP6][x86_64][Build46.40] Unable to create repository due to valid metadata not found");
enter_cmd("yast.ssh");
}
else {
enter_cmd("DISPLAY= yast.ssh");
}
}
else {
enter_cmd("yast.ssh");
}
save_screenshot;
#wait upgrade finish
assert_screen('rebootnow', 2700);
#wait offline upgrade starts with ssh port open
die "Offline upgrade failed to start because ssh port is not open" unless (check_port_state(get_required_var('SUT_IP'), 22, 30, 10));
record_info("First stage offline upgrade starts");
save_screenshot;
send_key 'ret';
#leave ssh console and switch to sol console
switch_from_ssh_to_sol_console(reset_console_flag => 'on');
save_screenshot;
send_key 'ret';
#wait grub2 boot menu after first stage upgrade
unless (check_screen('grub2', timeout => 290)) {
record_info("Reboot SUT", "Reboot " . get_required_var("SUT_IP") . " to match grub2 menu because last match failed");
ipmi_backend_utils::ipmitool("chassis power reset");
assert_screen('grub2', timeout => 300);
#wait ssh port down after first stage upgrade finishes
my $wait_ssh_port_down = 7200;
while ($wait_ssh_port_down >= 0) {
last unless (check_port_state(get_required_var('SUT_IP'), 22));
sleep 30;
$wait_ssh_port_down -= 30;
}
#wait sshd up after first stage upgrade
die "Can not connect to machine to perform offline upgrade second stage via ssh" unless (check_port_state(get_required_var('SUT_IP'), 22, 20));
save_screenshot;
#switch to ssh console
use_ssh_serial_console;
save_screenshot;
#start second stage upgrade
enter_cmd("DISPLAY= yast.ssh");
save_screenshot;
#wait for second stage upgrade completion
assert_screen('yast2-second-stage-done', 300);
#leave ssh console and switch to sol console
switch_from_ssh_to_sol_console(reset_console_flag => 'on');
save_screenshot;
send_key 'ret';
die "First stage offline upgrade failed to finish after 2hrs" if (check_port_state(get_required_var('SUT_IP'), 22));
record_info("First stage offline upgrade finishes");
save_screenshot;
#wait system boots up for second stage upgrade
die "Second stage offline upgrade can not start because ssh port is not open" unless (check_port_state(get_required_var('SUT_IP'), 22, 30, 10));
record_info("System boots up for second stage offline upgrade");
#wait second stage upgrade finishes
wait_still_screen(stilltime => 60, timeout => 300);
send_key('ret') for (0 .. 2);
assert_screen('linux-login', timeout => 60);
record_info("Second stage offline upgrade finishes");
}
#setup vars
set_var('UPGRADE_AFTER_REBOOT', '');
Expand Down
5 changes: 3 additions & 2 deletions tests/virt_autotest/reboot_and_wait_up_upgrade.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ sub run {
diag("Debug info for reboot_and_wait_up_upgrade: this is online upgrade");
}
else {
#OpenQA needs ssh way to trigger offline upgrade
script_run("sed -i s/sshd=1/ssh=1/g /boot/grub2/grub.cfg /boot/grub/menu.lst");
#offline upgrade will be performed automatically on ipmi sol console with sshd=1 and console=ttyS1 in grub config, for example,
#linux path-to-linux autoupgrade=1 console=ttyS1,115200 vga=791 Y2DEBUG=1 xvideo=1024x768 ssh=1 sshpassword=xxxxx install=xxxxx
script_run("sed -i -r \'/autoupgrade=1/ s/\\bconsole=tty(\\b|\$)//g\' /boot/grub2/grub.cfg /boot/grub/menu.lst");
diag("Debug info for reboot_and_wait_up_upgrade: this is offline upgrade. Need to clean up redundant disks using clean_up_red_disks.");
clean_up_red_disks unless check_var('VIRT_PRJ2_HOST_UPGRADE', '');
}
Expand Down

0 comments on commit 3c85738

Please sign in to comment.