From 4e932ad809cd7e5fa046be8654db5982ffbab0d2 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Wed, 14 Feb 2024 11:39:01 +0100 Subject: [PATCH] Simplify service_port_delta with environment variable Related progress issue: https://progress.opensuse.org/issues/153499 --- container/single-instance/Dockerfile | 4 ++-- lib/OpenQA/Setup.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/container/single-instance/Dockerfile b/container/single-instance/Dockerfile index e0bd9682cde5..d7576e49c867 100644 --- a/container/single-instance/Dockerfile +++ b/container/single-instance/Dockerfile @@ -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 diff --git a/lib/OpenQA/Setup.pm b/lib/OpenQA/Setup.pm index 8f4f32204e72..aa091df8baa5 100644 --- a/lib/OpenQA/Setup.pm +++ b/lib/OpenQA/Setup.pm @@ -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,