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

Configures self_update repo and adjust welcome to import key #10864

Merged
merged 1 commit into from
Aug 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion schedule/yast/yast_self_update/yast_self_update.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: >
Installation is validated by successful boot and that YaST does not report
any issue.
vars:
INSTALLER_SELF_UPDATE: 1
INSTALLER_SELF_UPDATE: http://openqa.suse.de/assets/repo/SLE-15-x86_64-self_update
schedule:
- installation/isosize
- installation/bootloader_start
Expand Down
3 changes: 3 additions & 0 deletions tests/installation/welcome.pm
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use x11utils 'ensure_fullscreen';
use version_utils qw(:VERSION :SCENARIO);
use Utils::Backends 'is_remote_backend';
use Utils::Architectures;
use utils 'handle_untrusted_gpg_key';

sub switch_keyboard_layout {
record_info 'keyboard layout', 'Check keyboard layout switching to another language';
Expand Down Expand Up @@ -105,6 +106,7 @@ sub run {
# Add tag to check for https://progress.opensuse.org/issues/30823 "test is
# stuck in linuxrc asking if dhcp should be used"
push @welcome_tags, 'linuxrc-dhcp-question';
push @welcome_tags, 'import-known-untrusted-gpg-key' if get_var('INSTALLER_SELF_UPDATE');

# Process expected pop-up windows and exit when welcome/beta_war is shown or too many iterations
while ($iterations++ < scalar(@welcome_tags)) {
Expand All @@ -115,6 +117,7 @@ sub run {
if ((match_has_tag 'inst-betawarning') || (match_has_tag 'inst-welcome') || (match_has_tag 'inst-welcome-no-product-list')) {
last;
}
handle_untrusted_gpg_key;
jknphy marked this conversation as resolved.
Show resolved Hide resolved
if (match_has_tag 'scc-invalid-url') {
die 'SCC reg URL is invalid' if !get_var('SCC_URL_VALID');
send_key 'alt-r'; # registration URL field
Expand Down