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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
baierjan
force-pushed
the
openqa_bootstrap
branch
from
June 5, 2023 12:05
2310a0e
to
1d11aab
Compare
okurz
requested changes
Jun 5, 2023
Martchus
approved these changes
Jun 5, 2023
baierjan
force-pushed
the
openqa_bootstrap
branch
from
June 5, 2023 12:38
1d11aab
to
e7e2ce6
Compare
#119 should fix the container test |
baierjan
force-pushed
the
openqa_bootstrap
branch
from
June 5, 2023 14:17
e7e2ce6
to
e557811
Compare
okurz
requested changes
Jun 5, 2023
tests/install/openqa_webui.pm
Outdated
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; | ||
} | ||
} |
There was a problem hiding this comment.
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;
}
This comment was marked as resolved.
This comment was marked as resolved.
baierjan
force-pushed
the
openqa_bootstrap
branch
from
June 5, 2023 15:11
e557811
to
2795b97
Compare
perlpunk
approved these changes
Jun 5, 2023
okurz
approved these changes
Jun 5, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reference: https://progress.opensuse.org/issues/130369
Verification: https://openqa.opensuse.org/tests/3336996
Note: This test will not yet be scheduled.