RHOSDT-3.10: configure Tempo stage CI jobs for RHOSDT 3.10 release testing

ci-operator/config/openshift/distributed-tracing-qe/openshift-distributed-tracing-qe-main__ocp-4.16-disconnected.yaml

@@ -23,9 +23,8 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.16"
 resources:
   '*':
@@ -48,6 +47,9 @@ tests:
   steps:
     cluster_profile: gcp-observability
     env:
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
+      MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1155560
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1157120
       OPERATORS: |
         [
             {"name": "amq-streams", "source": "cs-redhat-operator-index", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
@@ -56,6 +58,9 @@ tests:
         ]
       SELF_MANAGED_ADDITIONAL_CA: "true"
       SELF_MANAGED_REGISTRY_CERT: "true"
+    post:
+    - ref: openshift-observability-qe-agent
+    - chain: cucushift-installer-rehearse-gcp-ipi-disconnected-deprovision
     test:
     - ref: distributed-tracing-install-disconnected
     - ref: install-operators

ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.12-stage.yaml

@@ -20,9 +20,8 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.12"
 resources:
   '*':
@@ -43,9 +42,11 @@ tests:
       Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
       {{end}}'
   steps:
-    cluster_profile: azure-observability
+    cluster_profile: gcp-observability
     env:
-      BASE_DOMAIN: observability.azure.devcluster.openshift.com
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1157117
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OPERATORS: |
         [
             {"name": "tempo-product", "source": "tempo-catalogsource", "channel": "stable", "install_namespace": "openshift-tempo-operator","target_namespaces": "", "operator_group": "openshift-tempo-operator"},
@@ -54,12 +55,15 @@ tests:
             {"name": "kiali-ossm", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
             {"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
         ]
-      SKIP_TESTS: tests/e2e-openshift-object-stores/*
+      SKIP_TESTS: tests/e2e-openshift-object-stores/* tests/e2e-openshift-tls-profile/03-tls-profile
+    post:
+    - ref: openshift-observability-qe-agent
+    - chain: cucushift-installer-rehearse-gcp-ipi-deprovision
     test:
     - ref: distributed-tracing-install-tempo-konflux-catalogsource
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-stage
-    workflow: cucushift-installer-rehearse-azure-ipi
+    workflow: cucushift-installer-rehearse-gcp-ipi
 zz_generated_metadata:
   branch: main
   org: openshift

ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.14-arm-stage.yaml

@@ -20,22 +20,19 @@ images:
     to: obs-tests-runner
 releases:
   arm64-latest:
-    candidate:
+    release:
       architecture: arm64
-      product: ocp
-      stream: nightly
+      channel: stable
       version: "4.14"
   latest:
-    candidate:
+    release:
       architecture: amd64
-      product: ocp
-      stream: nightly
+      channel: stable
       version: "4.14"
   target:
-    candidate:
+    release:
       architecture: multi
-      product: ocp
-      stream: nightly
+      channel: stable
       version: "4.14"
 resources:
   '*':
@@ -60,8 +57,11 @@ tests:
     dependencies:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
       BASE_DOMAIN: observability.azure.devcluster.openshift.com
       COMPUTE_NODE_TYPE: Standard_D4ps_v5
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: quay.io/redhat-user-workloads/rhosdt-tenant/tempo/tempo-bundle@sha256:90cfc733bf3815568738cf089ed13fa232561b0c24ce0c99b71154753254b1be
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OCP_ARCH: arm64
       OPERATORS: |
         [
@@ -71,7 +71,10 @@ tests:
             {"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
         ]
       SKIP_TESTS: tests/e2e/generate tests/e2e-openshift/monolithic-multitenancy-static
-        tests/e2e-openshift-serverless/* tests/e2e-openshift-object-stores/*
+        tests/e2e-openshift-serverless/* tests/e2e-openshift-object-stores/* tests/e2e-openshift-tls-profile/03-tls-profile
+    post:
+    - ref: openshift-observability-qe-agent
+    - chain: cucushift-installer-rehearse-azure-ipi-deprovision
     test:
     - ref: idp-htpasswd
     - as: install-tempo-operator
@@ -86,6 +89,9 @@ tests:
         oc label namespace openshift-tempo-operator openshift.io/cluster-monitoring="true"
         operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE"
         oc wait --for condition=Available -n openshift-tempo-operator deployment tempo-operator-controller
+      env:
+      - default: ""
+        name: MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE
       from: operator-sdk
       resources:
         requests:

ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.16-ibm-z-stage.yaml

@@ -20,9 +20,8 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.16"
 resources:
   '*':
@@ -44,6 +43,9 @@ tests:
       {{end}}'
   steps:
     env:
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: quay.io/redhat-user-workloads/rhosdt-tenant/tempo/tempo-bundle@sha256:90cfc733bf3815568738cf089ed13fa232561b0c24ce0c99b71154753254b1be
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OPERATORS: |
         [
             {"name": "opentelemetry-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespaces": "", "operator_group": "openshift-opentelemetry-operator"},
@@ -55,6 +57,9 @@ tests:
         ]
       SKIP_TESTS: tests/e2e/generate tests/e2e/gateway tests/e2e-openshift/monolithic-multitenancy-static
         tests/e2e-openshift-ossm/* tests/e2e-openshift-object-stores/* tests/e2e-openshift-serverless/*
+    post:
+    - ref: openshift-observability-qe-agent
+    - ref: openshift-observability-ibm-z-cluster-destroy
     test:
     - ref: idp-htpasswd
     - as: install-tempo-operator
@@ -69,14 +74,16 @@ tests:
         oc label namespace openshift-tempo-operator openshift.io/cluster-monitoring="true"
         operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE"
         oc wait --for condition=Available -n openshift-tempo-operator deployment tempo-operator-controller
+      env:
+      - default: ""
+        name: MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE
       from: operator-sdk
       resources:
         requests:
           cpu: 1000m
           memory: 400Mi
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-stage
-    - ref: distributed-tracing-tests-tracing-ui-integration
     workflow: openshift-observability-ibm-z
 zz_generated_metadata:
   branch: main

ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-fips-stage.yaml

@@ -20,9 +20,8 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.17"
 resources:
   '*':
@@ -43,10 +42,12 @@ tests:
       Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
       {{end}}'
   steps:
-    cluster_profile: azure-observability
+    cluster_profile: gcp-observability
     env:
-      BASE_DOMAIN: observability.azure.devcluster.openshift.com
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
       FIPS_ENABLED: "true"
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1157124
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OPERATORS: |
         [
             {"name": "tempo-product", "source": "tempo-catalogsource", "channel": "stable", "install_namespace": "openshift-tempo-operator","target_namespaces": "", "operator_group": "openshift-tempo-operator"},
@@ -57,13 +58,15 @@ tests:
             {"name": "lightspeed-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-lightspeed", "target_namespaces": "openshift-lightspeed", "operator_group": "openshift-lightspeed"},
             {"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
         ]
-      SKIP_TESTS: tests/e2e-openshift-object-stores/*
+      SKIP_TESTS: tests/e2e-openshift-object-stores/* tests/e2e-openshift-tls-profile/03-tls-profile
+    post:
+    - ref: openshift-observability-qe-agent
+    - chain: cucushift-installer-rehearse-gcp-ipi-deprovision
     test:
     - ref: distributed-tracing-install-tempo-konflux-catalogsource
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-stage
-    - ref: distributed-tracing-tests-tracing-ui-integration
-    workflow: cucushift-installer-rehearse-azure-ipi
+    workflow: cucushift-installer-rehearse-gcp-ipi
 zz_generated_metadata:
   branch: main
   org: openshift

ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.17-ibm-p-stage.yaml

@@ -20,9 +20,8 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.17"
 resources:
   '*':
@@ -44,7 +43,10 @@ tests:
       {{end}}'
   steps:
     env:
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
       FIPS_ENABLED: "false"
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: quay.io/redhat-user-workloads/rhosdt-tenant/tempo/tempo-bundle@sha256:90cfc733bf3815568738cf089ed13fa232561b0c24ce0c99b71154753254b1be
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OCP_CLUSTER_VERSION: stable-4.17
       OPERATORS: |
         [
@@ -57,6 +59,9 @@ tests:
         ]
       SKIP_TESTS: tests/e2e/generate tests/e2e/gateway tests/e2e-openshift/monolithic-multitenancy-static
         tests/e2e-openshift-ossm/* tests/e2e-openshift-object-stores/* tests/e2e-openshift-serverless/*
+    post:
+    - ref: openshift-observability-qe-agent
+    - ref: openshift-observability-ibm-p-cluster-destroy
     test:
     - ref: idp-htpasswd
     - as: install-tempo-operator
@@ -71,14 +76,16 @@ tests:
         oc label namespace openshift-tempo-operator openshift.io/cluster-monitoring="true"
         operator-sdk run bundle --timeout=10m --security-context-config restricted -n openshift-tempo-operator "$MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE"
         oc wait --for condition=Available -n openshift-tempo-operator deployment tempo-operator-controller
+      env:
+      - default: ""
+        name: MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE
       from: operator-sdk
       resources:
         requests:
           cpu: 1000m
           memory: 400Mi
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-stage
-    - ref: distributed-tracing-tests-tracing-ui-integration
     workflow: openshift-observability-ibm-p
 zz_generated_metadata:
   branch: main

ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.19-stage.yaml

@@ -16,9 +16,8 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    candidate:
-      product: ocp
-      stream: nightly
+    release:
+      channel: stable
       version: "4.19"
 resources:
   '*':
@@ -49,6 +48,9 @@ tests:
       {{end}}'
   steps:
     env:
+      AGENT_SKILL_URL: https://raw.githubusercontent.com/openshift/distributed-tracing-qe/main/plugins/qe-agent/skills/SKILL.md
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1157126
+      MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OPERATORS: |
         [
             {"name": "tempo-product", "source": "tempo-catalogsource", "channel": "stable", "install_namespace": "openshift-tempo-operator","target_namespaces": "", "operator_group": "openshift-tempo-operator"},
@@ -60,11 +62,13 @@ tests:
             {"name": "serverless-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-serverless", "target_namespaces": "", "operator_group": "openshift-serverless"}
         ]
       SKIP_TESTS: tests/e2e-openshift-object-stores/*
+    post:
+    - ref: openshift-observability-qe-agent
+    - chain: gather
     test:
     - ref: distributed-tracing-install-tempo-konflux-catalogsource
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-stage
-    - ref: distributed-tracing-tests-tracing-ui-integration
     workflow: generic-claim
 zz_generated_metadata:
   branch: main