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.

Sign up for GitHub

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

Jump to bottom

Fix reboot_gnome on s390x svirt #2483

Merged
merged 1 commit into from
Mar 1, 2017
Merged

Fix reboot_gnome on s390x svirt #2483

merged 1 commit into from
Mar 1, 2017

Conversation

dzedro
Copy link
Contributor

@dzedro dzedro commented Mar 1, 2017

@Soulofdestiny
Copy link
Contributor

@dzedro LGTM
@mnowaksuse This will not really affect your svirt testing, right?

@okurz
Copy link
Member

okurz commented Mar 1, 2017

wouldn't mind having a comment pointing to the unlock part for svirt

@dzedro
Copy link
Contributor Author

dzedro commented Mar 1, 2017

@mnowaksuse or maybe I should use !check_var('BACKEND', 'svirt') and check_var('ARCH', 's390x')

@mnowaksuse
Copy link

or maybe I should use !check_var('BACKEND', 'svirt') and check_var('ARCH', 's390x')

@dzedro Yes, please do this or use S390_ZKVM variable. unlock_if_encrypted() should work fine for non-zKVM svirt tests.

sysrich
sysrich requested changes Mar 1, 2017
View reviewed changes
lib/opensusebasetest.pm Outdated
@@ -293,7 +293,8 @@ sub wait_boot {
}
}

unlock_if_encrypted;
# on svirt is system unlocked with workaround_type_encrypted_passphrase before this wait_boot
unlock_if_encrypted if !check_var('BACKEND', 'svirt');
Copy link
Member

Choose a reason for hiding this comment

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

As suggested, please us !check_var('BACKEND', 'svirt') and check_var('ARCH', 's390x') or use S390_ZKVM variable

@dzedro
Copy link
Contributor Author

dzedro commented Mar 1, 2017

Updated

@Soulofdestiny Soulofdestiny merged commit 54e464a into os-autoinst:master Mar 1, 2017
@dzedro dzedro deleted the master branch March 1, 2017 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sysrich sysrich sysrich requested changes

@Soulofdestiny Soulofdestiny Soulofdestiny approved these changes

@mnowaksuse mnowaksuse mnowaksuse approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dzedro @Soulofdestiny @okurz @mnowaksuse @sysrich