Skip to content
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

Jump to bottom

Use the OpenShift bundle Dockerfile in OTEL jobs #54612

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Use the OpenShift bundle Dockerfile in OTEL jobs #54612

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
2 changes: 1 addition & 1 deletion ...elemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ images:
operator:
bundles:
- as: opentelemetry-bundle
context_dir: .
context_dir: ./bundle/openshift
dockerfile_path: bundle.Dockerfile
substitutions:
- pullspec: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:.*
Expand Down
2 changes: 1 addition & 1 deletion ...perator/openshift-open-telemetry-opentelemetry-operator-main__ocp-4.13-amd64-upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ images:
operator:
bundles:
- as: opentelemetry-bundle
context_dir: .
context_dir: ./bundle/openshift
dockerfile_path: bundle.Dockerfile
substitutions:
- pullspec: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:.*
Expand Down
2 changes: 1 addition & 1 deletion ...y-operator/openshift-open-telemetry-opentelemetry-operator-main__ocp-4.13-hypershift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ images:
operator:
bundles:
- as: opentelemetry-bundle
context_dir: .
context_dir: ./bundle/openshift
dockerfile_path: bundle.Dockerfile
substitutions:
- pullspec: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:.*
Expand Down
2 changes: 1 addition & 1 deletion ...emetry-operator/openshift-open-telemetry-opentelemetry-operator-main__ocp-4.14-amd64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ images:
operator:
bundles:
- as: opentelemetry-bundle
context_dir: .
context_dir: ./bundle/openshift
dockerfile_path: bundle.Dockerfile
substitutions:
- pullspec: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:.*
Expand Down
2 changes: 1 addition & 1 deletion ...stributed-tracing/tests/tempo/interop/distributed-tracing-tests-tempo-interop-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ mkdir -p /tmp/go/bin $GOCACHE \
git clone https://github.com/grafana/tempo-operator.git /tmp/tempo-tests
cd /tmp/tempo-tests
git checkout -b downstream-release "${INTEROP_TESTS_COMMIT}"
make build
# make build

#Enable user workload monitoring.
oc apply -f tests/e2e-openshift/monitoring/01-workload-monitoring.yaml
Expand Down
2 changes: 1 addition & 1 deletion .../distributed-tracing/tests/tempo/interop/distributed-tracing-tests-tempo-interop-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ref:
memory: 3Gi
env:
- name: SKIP_TESTS
default: "tests/e2e-openshift/monitoring tests/e2e-openshift/red-metrics tests/e2e-openshift-ossm/*"
default: "tests/e2e-openshift/monitoring tests/e2e-openshift/red-metrics tests/e2e/generate tests/e2e-openshift-ossm/*"
documentation: "Space seperated test cases to skip from the test run. Example tests/e2e/reconcile tests/e2e/gateway"
- name: INTEROP_TESTS_COMMIT
documentation: "The Tempo operator repo commit which has the downstream release compatible test cases."
Expand Down
2 changes: 1 addition & 1 deletion ...d-tracing/tests/tempo/pre-upgrade/distributed-tracing-tests-tempo-pre-upgrade-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ mkdir -p /tmp/go/bin $GOCACHE \
git clone https://github.com/grafana/tempo-operator.git /tmp/tempo-tests
cd /tmp/tempo-tests
git checkout -b downstream-release "${DOWNSTREAM_TESTS_COMMIT}"
make build
# make build
mkdir /tmp/kuttl-manifests && cp minio.yaml /tmp/kuttl-manifests

# Remove test cases to be skipped from the test run
Expand Down
2 changes: 1 addition & 1 deletion ...uted-tracing/tests/tempo/pre-upgrade/distributed-tracing-tests-tempo-pre-upgrade-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ref:
default: "/tmp/kuttl-manifests"
documentation: One or more directories containing manifests to apply before running the tests.
- name: PRE_UPG_SKIP_TESTS
default: "tests/e2e/smoketest-with-jaeger tests/e2e-openshift/multitenancy"
default: "tests/e2e/smoketest-with-jaeger tests/e2e-openshift/multitenancy tests/e2e/generate"
documentation: "Space seperated test cases to skip from the test run. Example tests/e2e/reconcile tests/e2e/gateway"
- name: DOWNSTREAM_TESTS_COMMIT
documentation: "The Tempo operator repo commit which has the downstream release compatible test cases."
Expand Down