diff --git a/ci-operator/step-registry/distributed-tracing/tests/opentelemetry/stage/distributed-tracing-tests-opentelemetry-stage-commands.sh b/ci-operator/step-registry/distributed-tracing/tests/opentelemetry/stage/distributed-tracing-tests-opentelemetry-stage-commands.sh index 6093e9c9ff8fa..ea1efa0e40921 100644 --- a/ci-operator/step-registry/distributed-tracing/tests/opentelemetry/stage/distributed-tracing-tests-opentelemetry-stage-commands.sh +++ b/ci-operator/step-registry/distributed-tracing/tests/opentelemetry/stage/distributed-tracing-tests-opentelemetry-stage-commands.sh @@ -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 diff --git a/ci-operator/step-registry/distributed-tracing/tests/opentelemetry/stage/distributed-tracing-tests-opentelemetry-stage-ref.yaml b/ci-operator/step-registry/distributed-tracing/tests/opentelemetry/stage/distributed-tracing-tests-opentelemetry-stage-ref.yaml index deacb1fbb0dd5..7fd16136a11f2 100644 --- a/ci-operator/step-registry/distributed-tracing/tests/opentelemetry/stage/distributed-tracing-tests-opentelemetry-stage-ref.yaml +++ b/ci-operator/step-registry/distributed-tracing/tests/opentelemetry/stage/distributed-tracing-tests-opentelemetry-stage-ref.yaml @@ -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. diff --git a/ci-operator/step-registry/distributed-tracing/tests/tempo/stage/distributed-tracing-tests-tempo-stage-commands.sh b/ci-operator/step-registry/distributed-tracing/tests/tempo/stage/distributed-tracing-tests-tempo-stage-commands.sh index ef270fcbdb32c..6ab4a4e95e3b6 100644 --- a/ci-operator/step-registry/distributed-tracing/tests/tempo/stage/distributed-tracing-tests-tempo-stage-commands.sh +++ b/ci-operator/step-registry/distributed-tracing/tests/tempo/stage/distributed-tracing-tests-tempo-stage-commands.sh @@ -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. diff --git a/ci-operator/step-registry/distributed-tracing/tests/tempo/stage/distributed-tracing-tests-tempo-stage-ref.yaml b/ci-operator/step-registry/distributed-tracing/tests/tempo/stage/distributed-tracing-tests-tempo-stage-ref.yaml index f1172bfe978ea..a014870934d42 100644 --- a/ci-operator/step-registry/distributed-tracing/tests/tempo/stage/distributed-tracing-tests-tempo-stage-ref.yaml +++ b/ci-operator/step-registry/distributed-tracing/tests/tempo/stage/distributed-tracing-tests-tempo-stage-ref.yaml @@ -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.