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

Simplify service_port_delta with environment variable #5477

Merged
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions container/single-instance/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
# hadolint ignore=DL3037
RUN zypper in -y openQA-single-instance openQA-bootstrap \
qemu-arm qemu-ppc qemu-x86 qemu-tools sudo iputils os-autoinst-distri-opensuse-deps && \
zypper clean -a && \
sed -i -e 's/# service_port_delta =.*$/service_port_delta = 0/' /etc/openqa/openqa.ini
zypper clean -a
EXPOSE 80 443 9526
ENV skip_suse_specifics=1
ENV skip_suse_tests=1
ENV OPENQA_SERVICE_PORT_DELTA=0

ENTRYPOINT ["/usr/share/openqa/script/openqa-bootstrap"]
HEALTHCHECK CMD curl -f http://localhost || exit 1
2 changes: 1 addition & 1 deletion lib/OpenQA/Setup.pm
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ sub read_config ($app) {
auto_clone_limit => 20,
force_result_regex => '',
parallel_children_collapsable_results => join(' ', OK_RESULTS),
service_port_delta => 2,
service_port_delta => $ENV{OPENQA_SERVICE_PORT_DELTA} // 2,
},
rate_limits => {
search => 5,
Expand Down
Loading