Skip to content

[rhosdt] Fix stage tests branch parameter name for Gangway override #80118

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.

Sign up for GitHub

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

Merged
openshift-merge-bot merged 1 commit into from
Jun 4, 2026
Merged

[rhosdt] Fix stage tests branch parameter name for Gangway override #80118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...acing/tests/opentelemetry/stage/distributed-tracing-tests-opentelemetry-stage-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ set -o nounset
set -o errexit
set -o pipefail

if [[ -z "${OTEL_TESTS_BRANCH:-}" ]]; then
echo "ERROR: OTEL_TESTS_BRANCH is not set. Provide it via steps.env in the job config or via Gangway API pod_spec_options."
if [[ -z "${MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH:-}" ]]; then
echo "ERROR: MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH is not set. Provide it via steps.env in the job config or via Gangway API pod_spec_options."
exit 1
fi

git clone https://github.com/os-observability/opentelemetry-operator.git /tmp/otel-tests
cd /tmp/otel-tests
git checkout "${OTEL_TESTS_BRANCH}"
git checkout "${MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH}"

#Enable user workload monitoring
oc apply -f tests/e2e-openshift/otlp-metrics-traces/01-workload-monitoring.yaml
Expand Down
2 changes: 1 addition & 1 deletion ...-tracing/tests/opentelemetry/stage/distributed-tracing-tests-opentelemetry-stage-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ref:
- name: SKIP_TESTS
default: ""
documentation: "Space seperated test cases to skip from the test run. Example tests/e2e/smoke-targetallocator tests/e2e/prometheus-config-validation"
- name: OTEL_TESTS_BRANCH
- name: MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH
default: ""
documentation: |-
The branch to checkout from os-observability/opentelemetry-operator for running stage tests.
Expand Down
6 changes: 3 additions & 3 deletions ...y/distributed-tracing/tests/tempo/stage/distributed-tracing-tests-tempo-stage-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ export GOCACHE=/tmp/.cache/go-build
mkdir -p /tmp/go/bin $GOCACHE \
&& chmod -R 777 /tmp/go/bin $GOPATH $GOCACHE

if [[ -z "${TEMPO_TESTS_BRANCH:-}" ]]; then
echo "ERROR: TEMPO_TESTS_BRANCH is not set. Provide it via steps.env in the job config or via Gangway API pod_spec_options."
if [[ -z "${MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH:-}" ]]; then
echo "ERROR: MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH is not set. Provide it via steps.env in the job config or via Gangway API pod_spec_options."
exit 1
fi

git clone https://github.com/os-observability/tempo-operator.git /tmp/tempo-tests
cd /tmp/tempo-tests
git checkout "${TEMPO_TESTS_BRANCH}"
git checkout "${MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH}"
make build

#Enable user workload monitoring.
Expand Down
2 changes: 1 addition & 1 deletion ...stry/distributed-tracing/tests/tempo/stage/distributed-tracing-tests-tempo-stage-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ref:
- name: SKIP_TESTS
default: ""
documentation: "Space seperated test cases to skip from the test run. Example tests/e2e/reconcile tests/e2e/gateway"
- name: TEMPO_TESTS_BRANCH
- name: MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH
default: ""
documentation: |-
The branch to checkout from os-observability/tempo-operator for running stage tests.
Expand Down