From bc89a803e6fb197c81336c1729759896a6ae2ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Fri, 12 Jun 2026 09:58:56 +0200 Subject: [PATCH] openstack: inherit TEST_ARGS in openstack-tests steps The chain-level TEST_ARGS=--disable-monitor=termination-message-policy only affected the openshift-e2e-test step (step 1 of the chain). Both openstack-test-openstack-commands.sh and openstack-test-openstack-ote- commands.sh were clobbering TEST_ARGS with 'declare TEST_ARGS=""', so the monitor was still running in step 2. Change to 'declare TEST_ARGS="${TEST_ARGS:-}"' so the scripts inherit the chain's value. --- .../openstack-ote/openstack-test-openstack-ote-commands.sh | 2 +- .../test/openstack-ote/openstack-test-openstack-ote-ref.yaml | 4 ++++ .../test/openstack/openstack-test-openstack-commands.sh | 2 +- .../test/openstack/openstack-test-openstack-ref.yaml | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/openstack/test/openstack-ote/openstack-test-openstack-ote-commands.sh b/ci-operator/step-registry/openstack/test/openstack-ote/openstack-test-openstack-ote-commands.sh index a15727795873f..1124d01e231bc 100755 --- a/ci-operator/step-registry/openstack/test/openstack-ote/openstack-test-openstack-ote-commands.sh +++ b/ci-operator/step-registry/openstack/test/openstack-ote/openstack-test-openstack-ote-commands.sh @@ -5,7 +5,7 @@ set -Eeuo pipefail export OS_CLIENT_CONFIG_FILE="${SHARED_DIR}/clouds.yaml" export PATH=/usr/libexec/origin:$PATH -declare TEST_ARGS='' +declare TEST_ARGS="${TEST_ARGS:-}" # Force the IPv6 endpoint if [[ "${CONFIG_TYPE}" == *"singlestackv6"* ]]; then diff --git a/ci-operator/step-registry/openstack/test/openstack-ote/openstack-test-openstack-ote-ref.yaml b/ci-operator/step-registry/openstack/test/openstack-ote/openstack-test-openstack-ote-ref.yaml index 14e27a3ea9c68..9617e5ca1974f 100644 --- a/ci-operator/step-registry/openstack/test/openstack-ote/openstack-test-openstack-ote-ref.yaml +++ b/ci-operator/step-registry/openstack/test/openstack-ote/openstack-test-openstack-ote-ref.yaml @@ -20,6 +20,10 @@ ref: It is suggested to test the regex to make sure that it matches with the available tests. Tests can be listed by using 'openshift-tests run --dry-run (...)'. Sometimes, the tests that are printed in Prow won't exactly match the list returned by openshift-tests. + - name: TEST_ARGS + default: "" + documentation: |- + Additional arguments to be passed to 'openshift-tests' - name: CONFIG_TYPE default: '' documentation: | diff --git a/ci-operator/step-registry/openstack/test/openstack/openstack-test-openstack-commands.sh b/ci-operator/step-registry/openstack/test/openstack/openstack-test-openstack-commands.sh index 817a49385f17c..c0aacf1423a2e 100644 --- a/ci-operator/step-registry/openstack/test/openstack/openstack-test-openstack-commands.sh +++ b/ci-operator/step-registry/openstack/test/openstack/openstack-test-openstack-commands.sh @@ -4,7 +4,7 @@ set -Eeuo pipefail export OS_CLIENT_CONFIG_FILE="${SHARED_DIR}/clouds.yaml" -declare TEST_ARGS='' +declare TEST_ARGS="${TEST_ARGS:-}" # Force the IPv6 endpoint if [[ "${CONFIG_TYPE}" == *"singlestackv6"* ]]; then diff --git a/ci-operator/step-registry/openstack/test/openstack/openstack-test-openstack-ref.yaml b/ci-operator/step-registry/openstack/test/openstack/openstack-test-openstack-ref.yaml index 61a843feb3b0d..6896ca241eb80 100644 --- a/ci-operator/step-registry/openstack/test/openstack/openstack-test-openstack-ref.yaml +++ b/ci-operator/step-registry/openstack/test/openstack/openstack-test-openstack-ref.yaml @@ -18,6 +18,10 @@ ref: It is suggested to test the regex to make sure that it matches with the available tests. Tests can be listed by using 'openshift-tests run --dry-run (...)'. Sometimes, the tests that are printed in Prow won't exactly match the list returned by openshift-tests. + - name: TEST_ARGS + default: "" + documentation: |- + Additional arguments to be passed to 'openstack-tests' - name: CONFIG_TYPE default: '' documentation: |