Merge pull request openshift#53 from IshwarKanse/fixes

Fix tests to work on multiple RHOSDT versions
IshwarKanse · Aug 27, 2024 · ea8ebb9 · ea8ebb9
2 parents 5f97bbb + e81114f
commit ea8ebb9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 169 deletions.
diff --git a/tests/e2e-otel/routingconnector/chainsaw-test.yaml b/tests/e2e-otel/routingconnector/chainsaw-test.yaml
@@ -11,6 +11,21 @@ spec:
         file: install-tempo.yaml
     - assert:
         file: install-tempo-assert.yaml
+  - name: Check the status of Tempo Monolithc instance red
+    try:
+    - script:
+        timeout: 5m
+        content: kubectl get --namespace chainsaw-routecnctr tempomonolithics red -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}'
+  - name: Check the status of Tempo Monolithc instance blue
+    try:
+    - script:
+        timeout: 5m
+        content: kubectl get --namespace chainsaw-routecnctr tempomonolithics blue -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}'
+  - name: Check the status of Tempo Monolithc instance green
+    try:
+    - script:
+        timeout: 5m
+        content: kubectl get --namespace chainsaw-routecnctr tempomonolithics green -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}'
   - name: Create OTEL collector instance
     try:
     - apply:

diff --git a/tests/e2e-otel/routingconnector/install-tempo-assert.yaml b/tests/e2e-otel/routingconnector/install-tempo-assert.yaml
@@ -29,129 +29,3 @@ status:
   availableReplicas: 1
   readyReplicas: 1
   replicas: 1
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: tempo-blue-0
-  namespace: chainsaw-routecnctr
-status:
-  containerStatuses:
-  - name: tempo
-    ready: true
-    started: true
-  - name: tempo-query
-    ready: true
-    started: true
-  phase: Running
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: tempo-green-0
-  namespace: chainsaw-routecnctr
-status:
-  containerStatuses:
-  - name: tempo
-    ready: true
-    started: true
-  - name: tempo-query
-    ready: true
-    started: true
-  phase: Running
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: tempo-red-0
-  namespace: chainsaw-routecnctr
-status:
-  containerStatuses:
-  - name: tempo
-    ready: true
-    started: true
-  - name: tempo-query
-    ready: true
-    started: true
-  phase: Running
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: tempo-blue-jaegerui
-  namespace: chainsaw-routecnctr
-spec:
-  ports:
-  - name: jaeger-grpc
-    port: 16685
-    protocol: TCP
-    targetPort: jaeger-grpc
-  - name: jaeger-ui
-    port: 16686
-    protocol: TCP
-    targetPort: jaeger-ui
-  - name: jaeger-metrics
-    port: 16687
-    protocol: TCP
-    targetPort: jaeger-metrics
-  selector:
-    app.kubernetes.io/component: tempo
-    app.kubernetes.io/instance: blue
-    app.kubernetes.io/managed-by: tempo-operator
-    app.kubernetes.io/name: tempo-monolithic
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: tempo-green-jaegerui
-  namespace: chainsaw-routecnctr
-spec:
-  ports:
-  - name: jaeger-grpc
-    port: 16685
-    protocol: TCP
-    targetPort: jaeger-grpc
-  - name: jaeger-ui
-    port: 16686
-    protocol: TCP
-    targetPort: jaeger-ui
-  - name: jaeger-metrics
-    port: 16687
-    protocol: TCP
-    targetPort: jaeger-metrics
-  selector:
-    app.kubernetes.io/component: tempo
-    app.kubernetes.io/instance: green
-    app.kubernetes.io/managed-by: tempo-operator
-    app.kubernetes.io/name: tempo-monolithic
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: tempo-red-jaegerui
-  namespace: chainsaw-routecnctr
-spec:
-  ports:
-  - name: jaeger-grpc
-    port: 16685
-    protocol: TCP
-    targetPort: jaeger-grpc
-  - name: jaeger-ui
-    port: 16686
-    protocol: TCP
-    targetPort: jaeger-ui
-  - name: jaeger-metrics
-    port: 16687
-    protocol: TCP
-    targetPort: jaeger-metrics
-  selector:
-    app.kubernetes.io/component: tempo
-    app.kubernetes.io/instance: red
-    app.kubernetes.io/managed-by: tempo-operator
-    app.kubernetes.io/name: tempo-monolithic
diff --git a/tests/e2e-otel/transformprocessor/chainsaw-test.yaml b/tests/e2e-otel/transformprocessor/chainsaw-test.yaml
@@ -11,6 +11,11 @@ spec:
         file: install-tempo.yaml
     - assert:
         file: install-tempo-assert.yaml
+  - name: Check the status of Tempo Monolithc instance tprocssr
+    try:
+    - script:
+        timeout: 5m
+        content: kubectl get --namespace chainsaw-tprocssr tempomonolithics tprocssr -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}'
   - name: Create OTEL collector instance
     try:
     - apply:

diff --git a/tests/e2e-otel/transformprocessor/install-tempo-assert.yaml b/tests/e2e-otel/transformprocessor/install-tempo-assert.yaml
@@ -7,46 +7,3 @@ status:
   availableReplicas: 1
   readyReplicas: 1
   replicas: 1
-
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: tempo-tprocssr-0
-  namespace: chainsaw-tprocssr
-status:
-  containerStatuses:
-  - name: tempo
-    ready: true
-    started: true
-  - name: tempo-query
-    ready: true
-    started: true
-  phase: Running
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: tempo-tprocssr-jaegerui
-  namespace: chainsaw-tprocssr
-spec:
-  ports:
-  - name: jaeger-grpc
-    port: 16685
-    protocol: TCP
-    targetPort: jaeger-grpc
-  - name: jaeger-ui
-    port: 16686
-    protocol: TCP
-    targetPort: jaeger-ui
-  - name: jaeger-metrics
-    port: 16687
-    protocol: TCP
-    targetPort: jaeger-metrics
-  selector:
-    app.kubernetes.io/component: tempo
-    app.kubernetes.io/instance: tprocssr
-    app.kubernetes.io/managed-by: tempo-operator
-    app.kubernetes.io/name: tempo-monolithic
-