Skip to content

Commit

Permalink
Configures self_update repo and adjust welcome to import key
Browse files Browse the repository at this point in the history
To simulate the test scenario of self_update, I set the test to use
a custom rpm repository. We can not verify that the package from the repo
is actually used (testing only manual at the moment). We need this because the
default value of self_update is 1 which because it does not find anything to download
it just returns to the main repo and it does not install any updated package.
In additional i modified the welcome to import the gpg key that i have signed the repo.
Needle to be submitted.
  • Loading branch information
b10n1k committed Aug 24, 2020
1 parent efb3299 commit 6daaf09
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lib/bootloader_setup.pm
Expand Up @@ -697,7 +697,7 @@ sub specific_bootmenu_params {
diag "Disabling installer self update";
push @params, "self_update=0";
}
elsif (my $self_update_repo = get_var("INSTALLER_SELF_UPDATE")) {
elsif (my $self_update_repo = get_var("INSTALLER_SELF_UPDATE", '1')) {
push @params, "self_update=$self_update_repo";
diag "Explicitly enabling installer self update with $self_update_repo";
}
Expand Down Expand Up @@ -1294,7 +1294,7 @@ sub mimic_user_to_import {

sub type_boot_parameters {
my (@params) = @_;
type_string(" @params ", max_interval => check_var('TYPE_BOOT_PARAMS_FAST', 1) ? undef : utils::VERY_SLOW_TYPING_SPEED);
type_string(" @params ", max_interval => check_var('TYPE_BOOT_PARAMS_FAST', 1) ? undef : utils::SLOW_TYPING_SPEED);
}

1;
2 changes: 1 addition & 1 deletion schedule/yast/yast_self_update/yast_self_update.yaml
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
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';

# 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;
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

0 comments on commit 6daaf09

Please sign in to comment.