Update asserts for tests to work on OCP 4.18 (#1093)

grafana · Dec 2, 2024 · c38d7fd · c38d7fd
1 parent 1fb2623
commit c38d7fd
Show file tree

Hide file tree

Showing 60 changed files with 87 additions and 221 deletions.
diff --git a/tests/e2e-long-running/tempostack-retention-global/03-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/03-assert.yaml
@@ -3,6 +3,4 @@ kind: Job
 metadata:
   name: generate-traces
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-long-running/tempostack-retention-global/04-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/04-assert.yaml
@@ -3,6 +3,4 @@ kind: Job
 metadata:
   name: verify-traces-jaeger
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-long-running/tempostack-retention-global/05-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/05-assert.yaml
@@ -3,6 +3,4 @@ kind: Job
 metadata:
   name: verify-traces-grafana
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-long-running/tempostack-retention-global/verify-traces-grafana-ret-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/verify-traces-grafana-ret-assert.yaml
@@ -3,6 +3,4 @@ kind: Job
 metadata:
   name: verify-traces-grafana-ret
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-long-running/tempostack-retention-global/verify-traces-jaeger-ret-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/verify-traces-jaeger-ret-assert.yaml
@@ -3,6 +3,4 @@ kind: Job
 metadata:
   name: verify-traces-jaeger-ret
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift-ossm/ossm-monolithic-otel/install-otel-collector.yaml b/tests/e2e-openshift-ossm/ossm-monolithic-otel/install-otel-collector.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   config: |
     receivers:
-      zipkin:
+      zipkin: {}
       otlp:
         protocols:
           grpc:

diff --git a/tests/e2e-openshift-ossm/ossm-tempostack-otel/install-otel-collector.yaml b/tests/e2e-openshift-ossm/ossm-tempostack-otel/install-otel-collector.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   config: |
     receivers:
-      zipkin:
+      zipkin: {}
       otlp:
         protocols:
           grpc:

diff --git a/tests/e2e-openshift-serverless/otel-tempo-serverless/create-otel-collector.yaml b/tests/e2e-openshift-serverless/otel-tempo-serverless/create-otel-collector.yaml
@@ -7,7 +7,7 @@ spec:
   mode: deployment
   config: |
     receivers:
-      zipkin:
+      zipkin: {}
     processors:
     exporters:
       otlp:

diff --git a/tests/e2e-openshift-serverless/otel-tempo-serverless/verify-traces-assert.yaml b/tests/e2e-openshift-serverless/otel-tempo-serverless/verify-traces-assert.yaml
@@ -4,6 +4,4 @@ metadata:
   name: verify-traces
   namespace: chainsaw-otel-tempo-serverless
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift-serverless/tempo-serverless/verify-traces-assert.yaml b/tests/e2e-openshift-serverless/tempo-serverless/verify-traces-assert.yaml
@@ -4,6 +4,4 @@ metadata:
   name: verify-traces
   namespace: chainsaw-tempo-serverless
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift/component-replicas/generate-traces-assert.yaml b/tests/e2e-openshift/component-replicas/generate-traces-assert.yaml
@@ -4,16 +4,12 @@ metadata:
   name: generate-traces-grpc
   namespace: chainsaw-replicas
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: generate-traces-http
   namespace: chainsaw-replicas
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift/component-replicas/verify-traces-assert.yaml b/tests/e2e-openshift/component-replicas/verify-traces-assert.yaml
@@ -4,36 +4,28 @@ metadata:
   name: verify-traces-grpc
   namespace: chainsaw-replicas
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: verify-traces-traceql-grpc
   namespace: chainsaw-replicas
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: verify-traces-http
   namespace: chainsaw-replicas
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: verify-traces-traceql-http
   namespace: chainsaw-replicas
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift/monitoring-monolithic/chainsaw-test.yaml b/tests/e2e-openshift/monitoring-monolithic/chainsaw-test.yaml
@@ -29,8 +29,8 @@ spec:
     try:
     - apply:
         file: verify-traces.yaml
-    - apply:
-        file: workload-monitoring-assert.yaml
+    - assert:
+        file: verify-traces-assert.yaml
   - name: Check Tempo Monolithc metrics scraped by user workload monitoring
     try:
     - script:

diff --git a/tests/e2e-openshift/monitoring-monolithic/verify-traces-assert.yaml b/tests/e2e-openshift/monitoring-monolithic/verify-traces-assert.yaml
@@ -0,0 +1,6 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: verify-traces
+status:
+  succeeded: 1  
diff --git a/tests/e2e-openshift/monitoring/04-assert.yaml b/tests/e2e-openshift/monitoring/04-assert.yaml
@@ -17,6 +17,4 @@ kind: Job
 metadata:
   name: verify-traces
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift/monolithic-multitenancy-openshift/03-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-openshift/03-assert.yaml
@@ -3,15 +3,11 @@ kind: Job
 metadata:
   name: generate-traces-grpc
 status:
-  conditions:
-  - status: "True"
-    type: Complete
+  succeeded: 1
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: generate-traces-http
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift/monolithic-multitenancy-openshift/04-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-openshift/04-assert.yaml
@@ -3,33 +3,25 @@ kind: Job
 metadata:
   name: verify-traces-jaegerui-grpc
 status:
-  conditions:
-  - status: "True"
-    type: Complete
+  succeeded: 1
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: verify-traces-traceql-grpc
 status:
-  conditions:
-  - status: "True"
-    type: Complete
+  succeeded: 1
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: verify-traces-jaegerui-http
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: verify-traces-traceql-http
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift/monolithic-multitenancy-static/01-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-static/01-assert.yaml
@@ -3,6 +3,4 @@ kind: Job
 metadata:
   name: setup-hydra
 status:
-  conditions:
-  - status: "True"
-    type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift/monolithic-multitenancy-static/04-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-static/04-assert.yaml
@@ -3,6 +3,4 @@ kind: Job
 metadata:
   name: generate-traces
 status:
-  conditions:
-  - status: "True"
-    type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift/monolithic-multitenancy-static/05-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-static/05-assert.yaml
@@ -3,6 +3,4 @@ kind: Job
 metadata:
   name: verify-traces-traceql
 status:
-  conditions:
-  - status: "True"
-    type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift/monolithic-route/check-must-gather.sh b/tests/e2e-openshift/monolithic-route/check-must-gather.sh
@@ -15,7 +15,7 @@ REQUIRED_ITEMS=(
   "*sha*/olm/clusterserviceversion-tempo-operator-*.yaml"
   "*sha*/olm/operator-opentelemetry-product-openshift-opentelemetry-operator.yaml"
   "*sha*/olm/operator-tempo-*-tempo-operator.yaml"
-  "*sha*/olm/subscription-tempo-operator-*-sub.yaml"
+  "*sha*/olm/subscription-tempo-*.yaml"
   "*sha*/namespaces/chainsaw-mono-route/tempomonolithic/mono-route/tempomonolithic-mono-route.yaml"
   "*sha*/namespaces/chainsaw-mono-route/tempomonolithic/mono-route/service-tempo-mono-route-jaegerui.yaml"
   "*sha*/namespaces/chainsaw-mono-route/tempomonolithic/mono-route/configmap-tempo-mono-route-serving-cabundle.yaml"
@@ -38,4 +38,4 @@ for item in "${REQUIRED_ITEMS[@]}"; do
 done
 
 # Cleanup the must-gather directory
-rm -rf $MUST_GATHER_DIR
+rm -rf $MUST_GATHER_DIR
diff --git a/tests/e2e-openshift/monolithic-single-tenant-auth/generate-traces-assert.yaml b/tests/e2e-openshift/monolithic-single-tenant-auth/generate-traces-assert.yaml
@@ -4,6 +4,4 @@ metadata:
   name: generate-traces
   namespace: chainsaw-mst
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-jaeger-assert.yaml b/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-jaeger-assert.yaml
@@ -4,6 +4,4 @@ metadata:
   name: verify-traces-jaeger
   namespace: chainsaw-mst
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-traceql-assert.yaml b/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-traceql-assert.yaml
@@ -4,6 +4,4 @@ metadata:
   name: verify-traces-traceql
   namespace: chainsaw-mst
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift/multitenancy/03-assert.yaml b/tests/e2e-openshift/multitenancy/03-assert.yaml
@@ -4,16 +4,12 @@ metadata:
   name: generate-traces-grpc
   namespace: chainsaw-multitenancy
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: generate-traces-http
   namespace: chainsaw-multitenancy
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift/multitenancy/04-assert.yaml b/tests/e2e-openshift/multitenancy/04-assert.yaml
@@ -4,36 +4,28 @@ metadata:
   name: verify-traces-grpc
   namespace: chainsaw-multitenancy
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: verify-traces-traceql-grpc
   namespace: chainsaw-multitenancy
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: verify-traces-http
   namespace: chainsaw-multitenancy
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: verify-traces-traceql-http
   namespace: chainsaw-multitenancy
 status:
-  conditions:
-    - status: "True"
-      type: Complete
+  succeeded: 1
diff --git a/tests/e2e-openshift/red-metrics/02-install-otel-collector.yaml b/tests/e2e-openshift/red-metrics/02-install-otel-collector.yaml
@@ -34,7 +34,7 @@ spec:
         resource_to_telemetry_conversion: 
           enabled: true # by default resource attributes are dropped
 
-      logging:
+      debug:
 
       otlp:
         endpoint: tempo-redmetrics-distributor:4317
@@ -53,7 +53,7 @@ spec:
           exporters: [otlp, spanmetrics]
         metrics:
           receivers: [spanmetrics]
-          exporters: [prometheus, logging]
+          exporters: [prometheus, debug]
 
 ---
 apiVersion: monitoring.coreos.com/v1

diff --git a/tests/e2e-openshift/red-metrics/06-assert.yaml b/tests/e2e-openshift/red-metrics/06-assert.yaml
@@ -3,6 +3,4 @@ kind: Job
 metadata:
   name: verify-metrics
 status:
-  conditions:
-  - status: "True"
-    type: Complete
+  succeeded: 1