-
Notifications
You must be signed in to change notification settings - Fork 266
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
Conversation
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 |
According to @coolo's comment, switching to autoyast preparation |
05ccf31
to
469fd81
Compare
@Soulofdestiny @rwx788 @QingmingSu Could you review this? |
63175f1
to
b34ebdc
Compare
@@ -0,0 +1,254 @@ | |||
<?xml version="1.0"?> | |||
<!DOCTYPE profile> |
There was a problem hiding this comment.
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) |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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(); | ||
} |
There was a problem hiding this comment.
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
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 . |
cb3a0f4
to
193c8ca
Compare
Thanks for @okurz's review, rebased for fixes and travis check |
There was a problem hiding this 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')) { |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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'); |
There was a problem hiding this comment.
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.
LGTM |
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.
upgrade by media: http://bartok.arch.suse.de/tests/166 cancelled due to bsc#1084997
upgrade by proxy: http://bartok.arch.suse.de/tests/168 failed in scc_registration should be other potential issue