Update Tracing jobs to use OCP 4.22

IshwarKanse · IshwarKanse · commit e3b44d95005e · 2026-03-23T17:03:44.000+05:30
diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.12-amd64.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.12-amd64.yaml
@@ -1,14 +1,14 @@
 base_images:
   cli:
-    name: "4.14"
+    name: "4.12"
     namespace: ocp
     tag: cli
   operator-sdk:
-    name: "4.14"
+    name: "4.12"
     namespace: origin
     tag: operator-sdk
   upi-installer:
-    name: "4.14"
+    name: "4.12"
     namespace: ocp
     tag: upi-installer
 binary_build_commands: make build
@@ -38,7 +38,7 @@ releases:
     candidate:
       product: ocp
       stream: nightly
-      version: "4.14"
+      version: "4.12"
 resources:
   '*':
     requests:
@@ -86,4 +86,4 @@ zz_generated_metadata:
   branch: main
   org: openshift
   repo: grafana-tempo-operator
-  variant: upstream-ocp-4.14-amd64-azure
+  variant: upstream-ocp-4.12-amd64
diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.21-amd64.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.21-amd64.yaml
@@ -78,4 +78,4 @@ zz_generated_metadata:
   branch: main
   org: openshift
   repo: grafana-tempo-operator
-  variant: upstream-ocp-4.21-amd64-gcp
+  variant: upstream-ocp-4.21-amd64
diff --git a/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.22-amd64.yaml b/ci-operator/config/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main__upstream-ocp-4.22-amd64.yaml
@@ -1,12 +1,16 @@
 base_images:
   cli:
-    name: "4.20"
+    name: "4.22"
     namespace: ocp
     tag: cli
   operator-sdk:
     name: "4.19"
     namespace: origin
     tag: operator-sdk
+  upi-installer:
+    name: "4.12"
+    namespace: ocp
+    tag: upi-installer
 binary_build_commands: make build
 build_root:
   image_stream_tag:
@@ -34,7 +38,7 @@ releases:
     candidate:
       product: ocp
       stream: nightly
-      version: "4.20"
+      version: "4.22"
 resources:
   '*':
     requests:
@@ -48,17 +52,10 @@ tests:
       PROJECT_NAME: tempo-operator
     workflow: openshift-ci-security
 - as: tempo-upstream-tests
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    labels:
-      region: us-east-2
-    owner: obs
-    product: ocp
-    timeout: 1h0m0s
-    version: "4.20"
   steps:
+    cluster_profile: azure-observability
     env:
+      BASE_DOMAIN: observability.azure.devcluster.openshift.com
       OPERATORS: |
         [
             {"name": "opentelemetry-product", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-opentelemetry-operator", "target_namespaces": "", "operator_group": "openshift-opentelemetry-operator"},
@@ -87,9 +84,9 @@ tests:
     - ref: install-operators
     - ref: distributed-tracing-tests-tempo-upstream
     - ref: distributed-tracing-tests-tracing-ui-integration
-    workflow: generic-claim
+    workflow: cucushift-installer-rehearse-azure-ipi
 zz_generated_metadata:
   branch: main
   org: openshift
   repo: grafana-tempo-operator
-  variant: upstream-ocp-4.20-amd64-aws
+  variant: upstream-ocp-4.22-amd64
diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.12-amd64.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.12-amd64.yaml
@@ -1,14 +1,14 @@
 base_images:
   cli:
-    name: "4.14"
+    name: "4.12"
     namespace: ocp
     tag: cli
   operator-sdk:
-    name: "4.14"
+    name: "4.12"
     namespace: origin
     tag: operator-sdk
   upi-installer:
-    name: "4.14"
+    name: "4.12"
     namespace: ocp
     tag: upi-installer
 binary_build_commands: unset GOFLAGS && make manager && make targetallocator && make
@@ -96,7 +96,7 @@ releases:
     candidate:
       product: ocp
       stream: nightly
-      version: "4.14"
+      version: "4.12"
 resources:
   '*':
     requests:
@@ -121,7 +121,7 @@ tests:
             {"name": "amq-streams", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators", "target_namespaces": ""}
         ]
       SKIP_TESTS: tests/e2e/smoke-ip-families tests/e2e-openshift/export-to-cluster-logging-lokistack
-        tests/e2e-otel/*aws* tests/e2e-openshift/kafka tests/e2e-otel/google*
+        tests/e2e-otel/*aws* tests/e2e-openshift/kafka tests/e2e-otel/google* tests/e2e-targetallocator/targetallocator-prometheuscr
     test:
     - as: install
       cli: latest
@@ -145,4 +145,4 @@ zz_generated_metadata:
   branch: main
   org: openshift
   repo: open-telemetry-opentelemetry-operator
-  variant: upstream-ocp-4.14-amd64-azure
+  variant: upstream-ocp-4.12-amd64
diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.21-amd64.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.21-amd64.yaml
@@ -135,4 +135,4 @@ zz_generated_metadata:
   branch: main
   org: openshift
   repo: open-telemetry-opentelemetry-operator
-  variant: upstream-ocp-4.21-amd64-gcp
+  variant: upstream-ocp-4.21-amd64
diff --git a/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.22-amd64.yaml b/ci-operator/config/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main__upstream-ocp-4.22-amd64.yaml
@@ -1,6 +1,6 @@
 base_images:
   cli:
-    name: "4.20"
+    name: "4.22"
     namespace: ocp
     tag: cli
   operator-sdk:
@@ -92,7 +92,7 @@ releases:
     candidate:
       product: ocp
       stream: nightly
-      version: "4.20"
+      version: "4.22"
 resources:
   '*':
     requests:
@@ -107,16 +107,8 @@ tests:
       SNYK_PRE_EXECUTION_HOOK_CMD: go mod vendor && go mod tidy
     workflow: openshift-ci-security
 - as: opentelemetry-upstream-tests
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    labels:
-      region: us-east-2
-    owner: obs
-    product: ocp
-    timeout: 1h0m0s
-    version: "4.20"
   steps:
+    cluster_profile: gcp-observability
     env:
       OPERATORS: |
         [
@@ -145,9 +137,9 @@ tests:
           memory: 400Mi
     - ref: install-operators
     - ref: distributed-tracing-tests-opentelemetry-upstream
-    workflow: generic-claim
+    workflow: cucushift-installer-rehearse-gcp-ipi
 zz_generated_metadata:
   branch: main
   org: openshift
   repo: open-telemetry-opentelemetry-operator
-  variant: upstream-ocp-4.20-amd64-aws
+  variant: upstream-ocp-4.22-amd64
diff --git a/ci-operator/jobs/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/grafana-tempo-operator/openshift-grafana-tempo-operator-main-presubmits.yaml
diff --git a/ci-operator/jobs/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/open-telemetry-opentelemetry-operator/openshift-open-telemetry-opentelemetry-operator-main-presubmits.yaml
