Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade SLE12SP3 to SLE15 with zVM #4561

Merged
merged 1 commit into from
Mar 19, 2018

Conversation

mitiao
Copy link
Contributor

@mitiao mitiao commented Mar 6, 2018

Not use 2 chained jobs anymore to perform upgrade on zVM. Using autoyast to install origin system and then perform media upgrade or proxyscc upgrade on it. Upgrade scenarios could be controlled by different autoyast profile of origin system.

@coolo
Copy link
Contributor

coolo commented Mar 6, 2018

There is no guarantee that there is no job run between these 2 jobs - why aren't you doing this in one job changing VERSION in between? Preferably doing the preparation using autoyast

@mitiao
Copy link
Contributor Author

mitiao commented Mar 6, 2018

According to @coolo's comment, switching to autoyast preparation

@mitiao mitiao changed the title Upgrade SLE12SP3 to SLE15 with zVM [WIP]Upgrade SLE12SP3 to SLE15 with zVM Mar 6, 2018
@mitiao mitiao force-pushed the upgrade_15_zVM branch 3 times, most recently from 05ccf31 to 469fd81 Compare March 16, 2018 07:57
@mitiao mitiao changed the title [WIP]Upgrade SLE12SP3 to SLE15 with zVM Upgrade SLE12SP3 to SLE15 with zVM Mar 16, 2018
@mitiao
Copy link
Contributor Author

mitiao commented Mar 16, 2018

@Soulofdestiny @rwx788 @QingmingSu Could you review this?

@mitiao mitiao force-pushed the upgrade_15_zVM branch 2 times, most recently from 63175f1 to b34ebdc Compare March 16, 2018 10:55
@@ -0,0 +1,254 @@
<?xml version="1.0"?>
<!DOCTYPE profile>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo in profile name, should be default

lib/utils.pm Outdated
@@ -1026,6 +1029,86 @@ sub exec_and_insert_password {
send_key "ret";
}

=head2 shorten_url
shotren url via schort(s.qa.suse.de)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shorten

lib/utils.pm Outdated
@@ -1026,6 +1029,86 @@ sub exec_and_insert_password {
send_key "ret";
}

=head2 shorten_url
shotren url via schort(s.qa.suse.de)
This mainly use for autoyast url shorten to avoid limit of x3270 xedit
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is mainly used

send_key 'ctrl-alt-delete';
power_action('reboot', keepconsole => 0, observe => 0);
$self->wait_boot();
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually there is another PR open by me to remove this whole workaround section. I think if the fix has reached SLE12SP4 we can simply remove it

@okurz
Copy link
Member

okurz commented Mar 17, 2018

merged needle MR.

In general thank you very much for being the first to cover an autoyast installation in openQA on s390x as described in https://progress.opensuse.org/issues/11922 .

@mitiao mitiao force-pushed the upgrade_15_zVM branch 2 times, most recently from cb3a0f4 to 193c8ca Compare March 18, 2018 09:18
@mitiao
Copy link
Contributor Author

mitiao commented Mar 19, 2018

Thanks for @okurz's review, rebased for fixes and travis check

Copy link
Member

@okurz okurz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor change, then LGTM

$self->setup_migration();
# Update origin system on zVM that is controlled by autoyast profile and reboot is done by end of autoyast installation
# So we skip reboot here after fully patched on zVM to reduce times of reconnection to s390x
if (!get_var('UPGRADE_ON_zVM')) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use only uppercase for test variables. I think we do not have mixed lower+upper elsewhere.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

Not use 2 chained jobs anymore to perform upgrade on zVM.
Using autoyast to install origin system and then perform
media upgrade or proxyscc upgrade on it.
Upgrade scenarios could be controlled by different autoyast
profile of origin system.

See: https://progress.opensuse.org/issues/29101
@@ -132,6 +133,11 @@ sub run {
= qw(bios-boot nonexisting-package reboot-after-installation linuxrc-install-fail scc-invalid-url warning-pop-up inst-betawarning autoyast-boot);
push @needles, 'autoyast-confirm' if get_var('AUTOYAST_CONFIRM');
push @needles, 'autoyast-postpartscript' if get_var('USRSCR_DIALOG');
# Autoyast reboot automatically without confirmation, usually assert 'bios-boot' that is not existing on zVM
# So push a needle to check upcoming reboot on zVM that is a way to indicate the stage done
push @needles, 'autoyast-stage1-reboot-upcoming' if check_var('BACKEND', 's390x');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still wonder if we can do anything better than this needle, for example checking serial output. But let's try it out and see how we can improve.

@Soulofdestiny
Copy link
Contributor

LGTM

@Soulofdestiny Soulofdestiny merged commit c72adb4 into os-autoinst:master Mar 19, 2018
@mitiao mitiao deleted the upgrade_15_zVM branch March 20, 2018 02:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants