Skip to content

Fix OTEL/Tempo Jobs parameters #80115

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

Closed
pavolloffay wants to merge 1 commit into from
Closed

Fix OTEL/Tempo Jobs parameters #80115

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
8 changes: 7 additions & 1 deletion ...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,8 +4,14 @@ set -o nounset
set -o errexit
set -o pipefail

# Support both OTEL_TESTS_BRANCH and MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH
# The MULTISTAGE_PARAM_OVERRIDE_ prefix is required for Gangway API overrides
if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH:-}" ]]; then
OTEL_TESTS_BRANCH="${MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH}"
fi

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."
echo "ERROR: OTEL_TESTS_BRANCH is not set. Provide it via steps.env in the job config or via Gangway API pod_spec_options (use MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH for Gangway)."
exit 1
fi

Expand Down
10 changes: 10 additions & 0 deletions ...-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 @@ -16,5 +16,15 @@ ref:
The branch to checkout from os-observability/opentelemetry-operator for running stage tests.
This parameter must be set either in the job config steps.env or via Gangway API pod_spec_options.
The job will fail if left empty.
- name: MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH
default: ""
documentation: |-
Alternative to OTEL_TESTS_BRANCH for Gangway API. Pass via pod_spec_options.envs:
"pod_spec_options": {
"envs": {
"MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH": "rhosdt-3.10"
}
}
If both are set, MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH takes precedence.
documentation: |-
The distributed-tracing-tests-opentelemetry-stage step executes the OpenTelemetry Operator Stage tests.
8 changes: 7 additions & 1 deletion ...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,8 +14,14 @@ export GOCACHE=/tmp/.cache/go-build
mkdir -p /tmp/go/bin $GOCACHE \
&& chmod -R 777 /tmp/go/bin $GOPATH $GOCACHE

# Support both TEMPO_TESTS_BRANCH and MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH
# The MULTISTAGE_PARAM_OVERRIDE_ prefix is required for Gangway API overrides
if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH:-}" ]]; then
TEMPO_TESTS_BRANCH="${MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH}"
fi

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."
echo "ERROR: TEMPO_TESTS_BRANCH is not set. Provide it via steps.env in the job config or via Gangway API pod_spec_options (use MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH for Gangway)."
exit 1
fi

Expand Down
10 changes: 10 additions & 0 deletions ...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 @@ -16,5 +16,15 @@ ref:
The branch to checkout from os-observability/tempo-operator for running stage tests.
This parameter must be set either in the job config steps.env or via Gangway API pod_spec_options.
The job will fail if left empty.
- name: MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH
default: ""
documentation: |-
Alternative to TEMPO_TESTS_BRANCH for Gangway API. Pass via pod_spec_options.envs:
"pod_spec_options": {
"envs": {
"MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH": "rhosdt-3.10"
}
}
If both are set, MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH takes precedence.
documentation: |-
The distributed-tracing-tests-tempo-stage step executes the Tempo Operator Stage tests.