Switch Tempo and OTEL 4.22 upstream jobs from GCP to baremetal-lab-ipi and updated downstream testing jobs post RHOSDT 3.10 release.

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

@@ -42,8 +42,9 @@ tests:
       Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
       {{end}}'
   steps:
-    cluster_profile: gcp-observability
+    cluster_profile: aws-observability
     env:
+      BASE_DOMAIN: devobscluster.devcluster.openshift.com
       MULTISTAGE_PARAM_OVERRIDE_TEMPO_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1157117
       MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH: rhosdt-3.10
       OPERATORS: |
@@ -59,7 +60,7 @@ tests:
     - ref: distributed-tracing-install-tempo-konflux-catalogsource
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-stage
-    workflow: cucushift-installer-rehearse-gcp-ipi
+    workflow: cucushift-installer-rehearse-aws-ipi
 zz_generated_metadata:
   branch: main
   org: openshift

ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.20-downstream.yaml

@@ -3,6 +3,10 @@ base_images:
     name: "4.20"
     namespace: ocp
     tag: cli
+  upi-installer:
+    name: "4.20"
+    namespace: ocp
+    tag: upi-installer
 build_root:
   image_stream_tag:
     name: builder
@@ -27,15 +31,6 @@ resources:
       memory: 200Mi
 tests:
 - as: tempo-downstream-tests
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    labels:
-      region: us-east-2
-    owner: obs
-    product: ocp
-    timeout: 1h0m0s
-    version: "4.20"
   cron: 30 3 * * 1
   reporter_config:
     channel: '#distributed-tracing-qe'
@@ -48,7 +43,11 @@ tests:
       Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
       {{end}}'
   steps:
+    cluster_profile: azure-observability
     env:
+      BASE_DOMAIN: observability.azure.devcluster.openshift.com
+      COMPUTE_NODE_TYPE: Standard_D4s_v3
+      CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v3
       OPERATORS: |
         [
             {"name": "tempo-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-tempo-operator","target_namespace": "", "operator_group": "openshift-tempo-operator"},
@@ -62,7 +61,7 @@ tests:
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-downstream
     - ref: distributed-tracing-tests-tracing-ui-integration
-    workflow: generic-claim
+    workflow: cucushift-installer-rehearse-azure-ipi
 zz_generated_metadata:
   branch: main
   org: openshift

ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.19-downstream.yaml → ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__tempo-product-ocp-4.22-downstream.yaml

@@ -1,10 +1,10 @@
 base_images:
   cli:
-    name: "4.19"
+    name: "4.22"
     namespace: ocp
     tag: cli
   upi-installer:
-    name: "4.19"
+    name: "4.21"
     namespace: ocp
     tag: upi-installer
 build_root:
@@ -23,7 +23,7 @@ releases:
     candidate:
       product: ocp
       stream: nightly
-      version: "4.19"
+      version: "4.22"
 resources:
   '*':
     requests:
@@ -43,11 +43,9 @@ tests:
       Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
       {{end}}'
   steps:
-    cluster_profile: azure-observability
+    cluster_profile: aws-observability
     env:
-      BASE_DOMAIN: observability.azure.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: Standard_D4s_v3
-      CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v3
+      BASE_DOMAIN: devobscluster.devcluster.openshift.com
       OPERATORS: |
         [
             {"name": "tempo-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-tempo-operator","target_namespace": "", "operator_group": "openshift-tempo-operator"},
@@ -61,9 +59,9 @@ tests:
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-downstream
     - ref: distributed-tracing-tests-tracing-ui-integration
-    workflow: cucushift-installer-rehearse-azure-ipi
+    workflow: cucushift-installer-rehearse-aws-ipi
 zz_generated_metadata:
   branch: main
   org: openshift
   repo: grafana-tempo-operator
-  variant: tempo-product-ocp-4.19-downstream
+  variant: tempo-product-ocp-4.22-downstream

ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.22-amd64.yaml

@@ -43,10 +43,13 @@ resources:
       memory: 200Mi
 tests:
 - as: tempo-upstream-tests
+  capabilities:
+  - intranet
   steps:
-    cluster_profile: gcp-observability
+    cluster_profile: equinix-ocp-metal-qe
     env:
       AGENT_SKILL: TEMPO
+      AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
       OPERATORS: |
         [
             {"name": "opentelemetry-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespaces": "", "operator_group": "openshift-opentelemetry-operator"},
@@ -56,11 +59,16 @@ 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"}
         ]
+      RESERVE_BOOTSTRAP: "false"
       SKIP_TESTS: tests/e2e-openshift-object-stores/*
+      architecture: amd64
+      masters: "3"
+      workers: "2"
     post:
     - ref: openshift-observability-qe-agent
-    - chain: cucushift-installer-rehearse-gcp-ipi-deprovision
+    - chain: baremetal-lab-post
     test:
+    - ref: ipi-install-rbac
     - as: install
       cli: latest
       commands: |
@@ -77,7 +85,7 @@ tests:
           memory: 400Mi
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-upstream
-    workflow: cucushift-installer-rehearse-gcp-ipi
+    workflow: baremetal-lab-ipi
 zz_generated_metadata:
   branch: main
   org: openshift

ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.12-stage.yaml

@@ -42,8 +42,9 @@ tests:
       Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
       {{end}}'
   steps:
-    cluster_profile: gcp-observability
+    cluster_profile: aws-observability
     env:
+      BASE_DOMAIN: devobscluster.devcluster.openshift.com
       MULTISTAGE_PARAM_OVERRIDE_OTEL_INDEX_IMAGE: brew.registry.redhat.io/rh-osbs/iib:1155563
       MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH: rhosdt-3.10
       OPERATORS: |
@@ -59,7 +60,7 @@ tests:
     - ref: distributed-tracing-install-otel-konflux-catalogsource
     - ref: install-operators
     - ref: distributed-tracing-tests-opentelemetry-stage
-    workflow: cucushift-installer-rehearse-gcp-ipi
+    workflow: cucushift-installer-rehearse-aws-ipi
 zz_generated_metadata:
   branch: main
   org: openshift

ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.20-downstream.yaml

@@ -3,6 +3,10 @@ base_images:
     name: "4.20"
     namespace: ocp
     tag: cli
+  upi-installer:
+    name: "4.20"
+    namespace: ocp
+    tag: upi-installer
 build_root:
   image_stream_tag:
     name: builder
@@ -26,15 +30,6 @@ resources:
       memory: 200Mi
 tests:
 - as: opentelemetry-downstream-tests
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    labels:
-      region: us-east-2
-    owner: obs
-    product: ocp
-    timeout: 1h0m0s
-    version: "4.20"
   cron: 30 3 * * 2
   reporter_config:
     channel: '#distributed-tracing-qe'
@@ -47,7 +42,11 @@ tests:
       Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
       {{end}}'
   steps:
+    cluster_profile: azure-observability
     env:
+      BASE_DOMAIN: observability.azure.devcluster.openshift.com
+      COMPUTE_NODE_TYPE: Standard_D4s_v3
+      CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v3
       OPERATORS: |
         [
             {"name": "tempo-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-tempo-operator", "target_namespaces": "", "operator_group": "openshift-tempo-operator"},
@@ -58,10 +57,11 @@ tests:
             {"name": "cluster-logging", "source": "redhat-operators", "channel": "stable-6.3", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"}
         ]
       SKIP_TESTS: tests/e2e/smoke-ip-families tests/e2e-otel/*aws* tests/e2e-otel/google*
+        tests/e2e-instrumentation/instrumentation-go
     test:
     - ref: install-operators
     - ref: distributed-tracing-tests-opentelemetry-downstream
-    workflow: generic-claim
+    workflow: cucushift-installer-rehearse-azure-ipi
 zz_generated_metadata:
   branch: main
   org: openshift

ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.21-downstream.yaml

@@ -50,6 +50,7 @@ tests:
             {"name": "loki-operator", "source": "redhat-operators", "channel": "stable-6.4", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}
         ]
       SKIP_TESTS: tests/e2e/smoke-ip-families tests/e2e-otel/*aws* tests/e2e-otel/google*
+        tests/e2e-instrumentation/instrumentation-go
     test:
     - ref: install-operators
     - ref: distributed-tracing-tests-opentelemetry-downstream

ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.19-downstream.yaml → ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__opentelemetry-product-ocp-4.22-downstream.yaml

@@ -1,10 +1,10 @@
 base_images:
   cli:
-    name: "4.19"
+    name: "4.22"
     namespace: ocp
     tag: cli
   upi-installer:
-    name: "4.19"
+    name: "4.21"
     namespace: ocp
     tag: upi-installer
 build_root:
@@ -20,9 +20,10 @@ images:
     to: obs-tests-runner
 releases:
   latest:
-    release:
-      channel: stable
-      version: "4.19"
+    candidate:
+      product: ocp
+      stream: nightly
+      version: "4.22"
 resources:
   '*':
     requests:
@@ -42,27 +43,26 @@ tests:
       Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
       {{end}}'
   steps:
-    cluster_profile: azure-observability
+    cluster_profile: aws-observability
     env:
-      BASE_DOMAIN: observability.azure.devcluster.openshift.com
-      COMPUTE_NODE_TYPE: Standard_D4s_v3
-      CONTROL_PLANE_INSTANCE_TYPE: Standard_D8s_v3
+      BASE_DOMAIN: devobscluster.devcluster.openshift.com
       OPERATORS: |
         [
-            {"name": "tempo-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-tempo-operator", "target_namespaces": "", "operator_group": "openshift-tempo-operator"},
-            {"name": "opentelemetry-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespaces": "", "operator_group": "openshift-opentelemetry-operator"},
-            {"name": "amq-streams", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
+            {"name": "tempo-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-tempo-operator", "target_namespace": "", "operator_group": "openshift-tempo-operator"},
+            {"name": "opentelemetry-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespace": "", "operator_group": "openshift-opentelemetry-operator"},
+            {"name": "amq-streams", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespace": ""},
             {"name": "cluster-observability-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
-            {"name": "loki-operator", "source": "redhat-operators", "channel": "stable-6.2", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
-            {"name": "cluster-logging", "source": "redhat-operators", "channel": "stable-6.2", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"}
+            {"name": "cluster-logging", "source": "redhat-operators", "channel": "stable-6.4", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"},
+            {"name": "loki-operator", "source": "redhat-operators", "channel": "stable-6.4", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"}
         ]
       SKIP_TESTS: tests/e2e/smoke-ip-families tests/e2e-otel/*aws* tests/e2e-otel/google*
+        tests/e2e-instrumentation/instrumentation-go
     test:
     - ref: install-operators
     - ref: distributed-tracing-tests-opentelemetry-downstream
-    workflow: cucushift-installer-rehearse-azure-ipi
+    workflow: cucushift-installer-rehearse-aws-ipi
 zz_generated_metadata:
   branch: main
   org: openshift
   repo: open-telemetry-opentelemetry-operator
-  variant: opentelemetry-product-ocp-4.19-downstream
+  variant: opentelemetry-product-ocp-4.22-downstream

ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.22-amd64.yaml

@@ -101,22 +101,30 @@ resources:
       memory: 200Mi
 tests:
 - as: opentelemetry-upstream-tests
+  capabilities:
+  - intranet
   steps:
-    cluster_profile: gcp-observability
+    cluster_profile: equinix-ocp-metal-qe
     env:
       AGENT_SKILL: OTEL
+      AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
       OPERATORS: |
         [
             {"name": "tempo-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-tempo-operator", "target_namespaces": "", "operator_group": "openshift-tempo-operator"},
             {"name": "amq-streams", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""},
             {"name": "cluster-observability-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""}
         ]
+      RESERVE_BOOTSTRAP: "false"
       SKIP_TESTS: tests/e2e/smoke-ip-families tests/e2e-otel/*aws* tests/e2e-otel/google*
         tests/e2e-openshift/export-to-cluster-logging-lokistack tests/e2e-instrumentation/instrumentation-go
+      architecture: amd64
+      masters: "3"
+      workers: "2"
     post:
     - ref: openshift-observability-qe-agent
-    - chain: cucushift-installer-rehearse-gcp-ipi-deprovision
+    - chain: baremetal-lab-post
     test:
+    - ref: ipi-install-rbac
     - as: install
       cli: latest
       commands: |
@@ -134,7 +142,7 @@ tests:
           memory: 400Mi
     - ref: install-operators
     - ref: distributed-tracing-tests-opentelemetry-upstream
-    workflow: cucushift-installer-rehearse-gcp-ipi
+    workflow: baremetal-lab-ipi
 zz_generated_metadata:
   branch: main
   org: openshift