Use the OpenShift bundle Dockerfile in OTEL jobs (#54612)

openshift · Jul 22, 2024 · bae1f67 · bae1f67
1 parent 03ac3bf
commit bae1f67
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/...elemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main.yaml b/...elemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main.yaml
@@ -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:.*

diff --git a/...perator/openshift-open-telemetry-opentelemetry-operator-main__ocp-4.13-amd64-upgrade.yaml b/...perator/openshift-open-telemetry-opentelemetry-operator-main__ocp-4.13-amd64-upgrade.yaml
@@ -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:.*

diff --git a/...y-operator/openshift-open-telemetry-opentelemetry-operator-main__ocp-4.13-hypershift.yaml b/...y-operator/openshift-open-telemetry-opentelemetry-operator-main__ocp-4.13-hypershift.yaml
@@ -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:.*

diff --git a/...emetry-operator/openshift-open-telemetry-opentelemetry-operator-main__ocp-4.14-amd64.yaml b/...emetry-operator/openshift-open-telemetry-opentelemetry-operator-main__ocp-4.14-amd64.yaml
@@ -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:.*

diff --git a/...stributed-tracing/tests/tempo/interop/distributed-tracing-tests-tempo-interop-commands.sh b/...stributed-tracing/tests/tempo/interop/distributed-tracing-tests-tempo-interop-commands.sh
@@ -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

diff --git a/.../distributed-tracing/tests/tempo/interop/distributed-tracing-tests-tempo-interop-ref.yaml b/.../distributed-tracing/tests/tempo/interop/distributed-tracing-tests-tempo-interop-ref.yaml
@@ -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."

diff --git a/...d-tracing/tests/tempo/pre-upgrade/distributed-tracing-tests-tempo-pre-upgrade-commands.sh b/...d-tracing/tests/tempo/pre-upgrade/distributed-tracing-tests-tempo-pre-upgrade-commands.sh
@@ -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

diff --git a/...uted-tracing/tests/tempo/pre-upgrade/distributed-tracing-tests-tempo-pre-upgrade-ref.yaml b/...uted-tracing/tests/tempo/pre-upgrade/distributed-tracing-tests-tempo-pre-upgrade-ref.yaml
@@ -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."