Skip to content

Commit e38d5d7

Browse files
committed
Download script when openqa-bootstrap runs in Leap
Use always the latest bootstrap script from the repo as the rpm is not always the latest one. This will fix https://progress.opensuse.org/issues/180905 where the openQA config files have been moved around but the bootstrap script is not up to date. As for now there is not automatic submission on Leap and this is the easiest approach to fix the test module.
1 parent fcdd328 commit e38d5d7

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

tests/openqa/install/openqa_bootstrap.pm

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use warnings;
1111
use base "consoletest";
1212
use testapi;
1313
use utils;
14-
use version_utils qw(has_selinux);
14+
use version_utils qw(has_selinux is_leap);
1515

1616
sub run {
1717
select_console 'root-console';
@@ -24,7 +24,14 @@ sub run {
2424
if (has_selinux) {
2525
script_run('setsebool -P httpd_can_network_connect 1');
2626
}
27-
zypper_call('in openQA-bootstrap');
27+
if (is_leap) {
28+
# https://progress.opensuse.org/issues/180905
29+
assert_script_run('mkdir -p /usr/share/openqa/script/');
30+
assert_script_run('curl -L curl -L https://raw.githubusercontent.com/os-autoinst/openQA/refs/heads/master/script/openqa-bootstrap > /usr/share/openqa/script/openqa-bootstrap');
31+
assert_script_run('test -e /usr/share/openqa/script/openqa-bootstrap && chmod +x /usr/share/openqa/script/openqa-bootstrap');
32+
}
33+
else { zypper_call('in openQA-bootstrap'); }
34+
2835
my $proxy_var = get_var('OPENQA_WEB_PROXY') ? 'setup_web_proxy=' . get_var('OPENQA_WEB_PROXY') . ' ' : '';
2936
assert_script_run($proxy_var . "/usr/share/openqa/script/openqa-bootstrap", 4000);
3037
}

0 commit comments

Comments
 (0)