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

Add option to install openQA with bootstrap script #116

Merged
merged 2 commits into from Jun 5, 2023
Merged

Conversation

baierjan
Copy link
Member

@baierjan baierjan commented Jun 5, 2023

Reference: https://progress.opensuse.org/issues/130369

Verification: https://openqa.opensuse.org/tests/3336996

Note: This test will not yet be scheduled.

main.pm Outdated Show resolved Hide resolved
tests/install/openqa_webui.pm Outdated Show resolved Hide resolved
@perlpunk
Copy link
Contributor

perlpunk commented Jun 5, 2023

#119 should fix the container test

Comment on lines 76 to 86
else {
install_from_repos;
if (get_var('OPENQA_FROM_BOOTSTRAP')) {
assert_script_run('zypper --no-cd -n in openQA-bootstrap');
assert_script_run('skip_suse_specifics=1 skip_suse_tests=1 /usr/share/openqa/script/openqa-bootstrap', timeout => 1200);
}
else {
install_from_repos;
}
}
Copy link
Member

Choose a reason for hiding this comment

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

I suggest to un-nest this by one level:

elsif (get_var('OPENQA_FROM_BOOTSTRAP')) {
    assert_script_run('zypper --no-cd -n in openQA-bootstrap');
    assert_script_run('skip_suse_specifics=1 skip_suse_tests=1 /usr/share/openqa/script/openqa-bootstrap', timeout => 1200);
}
else {
    install_from_repos;
} 

For a consistent style I would define a function though. install_containers is also just two lines. So make this

sub install_from_bootstrap {
    assert_script_run('zypper --no-cd -n in openQA-bootstrap');
    assert_script_run('skip_suse_specifics=1 skip_suse_tests=1 /usr/share/openqa/script/openqa-bootstrap', timeout => 1200);
}
…
elsif (get_var('OPENQA_FROM_BOOTSTRAP')) {
    install_from_bootstrap;
}
else {
    install_from_repos;
}

@mergify

This comment was marked as resolved.

@mergify mergify bot merged commit 8e63c4f into master Jun 5, 2023
3 checks passed
@mergify mergify bot deleted the openqa_bootstrap branch June 5, 2023 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants