openshift · jmguzik · Mar 6, 2026 · Mar 6, 2026 · Mar 6, 2026 · Mar 6, 2026
diff --git a/...g/openshift-pipelines/console-plugin/openshift-pipelines-console-plugin-release-4.22.yaml b/...g/openshift-pipelines/console-plugin/openshift-pipelines-console-plugin-release-4.22.yaml
@@ -42,25 +42,6 @@ tests:
         requests:
           cpu: 100m
           memory: 200Mi
-- as: e2e
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: rh-openshift-ecosystem
-    product: ocp
-    timeout: 3h0m0s
-    version: "4.18"
-  steps:
-    test:
-    - as: e2e
-      cli: latest
-      commands: ./test-prow-e2e.sh
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: generic-claim
 zz_generated_metadata:
   branch: release-4.22
   org: openshift-pipelines

diff --git a/...g/openshift-pipelines/console-plugin/openshift-pipelines-console-plugin-release-4.23.yaml b/...g/openshift-pipelines/console-plugin/openshift-pipelines-console-plugin-release-4.23.yaml
@@ -41,25 +41,6 @@ tests:
         requests:
           cpu: 100m
           memory: 200Mi
-- as: e2e
-  cluster_claim:
-    architecture: amd64
-    cloud: aws
-    owner: rh-openshift-ecosystem
-    product: ocp
-    timeout: 3h0m0s
-    version: "4.18"
-  steps:
-    test:
-    - as: e2e
-      cli: latest
-      commands: ./test-prow-e2e.sh
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-    workflow: generic-claim
 zz_generated_metadata:
   branch: release-4.23
   org: openshift-pipelines

diff --git a/ci-operator/config/openshift-priv/cri-o/openshift-priv-cri-o-main.yaml b/ci-operator/config/openshift-priv/cri-o/openshift-priv-cri-o-main.yaml
@@ -0,0 +1,103 @@
+base_images:
+  base-machine:
+    name: centos
+    namespace: openshift
+    tag: stream9
+  rhel-coreos-base:
+    name: 4.23-priv
+    namespace: ocp-private
+    tag: rhel-coreos-9
+build_root:
+  image_stream_tag:
+    name: release
+    namespace: openshift
+    tag: rhel-9-release-golang-1.25-openshift-4.23
+canonical_go_repository: github.com/openshift/cri-o
+images:
+- dockerfile_literal: |
+    # We want to test the PR using the code from it. Now, this repo ships RPMs
+    # which are normally part of RHCOS. We need to make sure that RHCOS itself
+    # is updated with the freshly built RPMs from the PR run. To do this, we do a
+    # multi-stage build: the first stage downloads the RPMs that were just built
+    # (the `base-machine-with-rpms` contains the RPMs), and the second stage
+    # installs the RPMs into RHCOS (this uses the fact that RHCOS is now a native
+    # bootable container).
+    # See also: https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
+    FROM quay.io/centos/centos:stream9 as build
+    # Sadly rpm-ostree in rhel8 right now doesn't support e.g. `rpm-ostree upgrade openshift-hyperkube`
+    # in a container https://github.com/coreos/rpm-ostree/issues/4034
+    RUN ls -al /etc/yum.repos.d && dnf -y install dnf-utils && dnf --disablerepo='*' --enablerepo=built download cri-o
+    # See also https://issues.redhat.com/browse/ART-4352
+    FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos-9
+    COPY --from=build /*.rpm /
+    # Also delete leftover RPM files; see https://issues.redhat.com/browse/OCPBUGS-6505.
+    RUN rpm -Uvh --oldpackage /*.rpm && rm -vf /*.rpm /usr/share/rpm/__db.* /usr/share/rpm/.*.lock
+  inputs:
+    base-machine-with-rpms:
+      as:
+      - quay.io/centos/centos:stream9
+    rhel-coreos-base:
+      as:
+      - registry.ci.openshift.org/rhcos-devel/rhel-coreos-9
+  to: rhel-coreos-9
+promotion:
+  to:
+  - additional_images:
+      cri-o-rpms: rpms
+    excluded_images:
+    - rhel-coreos-9
+    name: 4.23-priv
+    namespace: ocp-private
+raw_steps:
+- rpm_image_injection_step:
+    from: base-machine
+    to: base-machine-with-rpms
+releases:
+  initial:
+    integration:
+      name: 4.23-priv
+      namespace: ocp-private
+  latest:
+    integration:
+      include_built_images: true
+      name: 4.23-priv
+      namespace: ocp-private
+resources:
+  '*':
+    requests:
+      cpu: 100m
+      memory: 4Gi
+rpm_build_commands: hack/build-rpms.sh
+rpm_build_location: _output/local/releases/rpms
+tests:
+- as: e2e-aws-ovn
+  skip_if_only_changed: ^(?:docs|tutorials|logo|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|SECURITY_CONTACTS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: aws
+    workflow: openshift-e2e-aws
+- as: e2e-gcp-ovn
+  skip_if_only_changed: ^(?:docs|tutorials|logo|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|SECURITY_CONTACTS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+- always_run: false
+  as: perfscale-control-plane-6nodes
+  steps:
+    allow_skip_on_success: true
+    cluster_profile: aws-perfscale-qe
+    env:
+      BASE_DOMAIN: qe.devcluster.openshift.com
+      COMPUTE_NODE_REPLICAS: "6"
+      ENABLE_LOCAL_INDEX: "true"
+      ES_TYPE: qe
+      EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=13s
+      ITERATION_MULTIPLIER_ENV: "15"
+      ZONES_COUNT: "3"
+    test:
+    - chain: openshift-qe-control-plane
+    - chain: openshift-qe-orion-consolidated
+    workflow: openshift-qe-installer-aws
+zz_generated_metadata:
+  branch: main
+  org: openshift-priv
+  repo: cri-o
diff --git a/ci-operator/config/openshift-priv/cri-o/openshift-priv-cri-o-release-4.22.yaml b/ci-operator/config/openshift-priv/cri-o/openshift-priv-cri-o-release-4.22.yaml
@@ -0,0 +1,78 @@
+base_images:
+  base-machine:
+    name: centos
+    namespace: openshift
+    tag: stream9
+  rhel-coreos-9-base:
+    name: 4.22-priv
+    namespace: ocp-private
+    tag: rhel-coreos-9
+build_root:
+  image_stream_tag:
+    name: release
+    namespace: openshift
+    tag: rhel-9-release-golang-1.25-openshift-4.22
+canonical_go_repository: github.com/openshift/cri-o
+images:
+- dockerfile_literal: |
+    # This uses the new rhel-coreos-9 base image
+    # https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
+    FROM quay.io/centos/centos:stream9 as build
+    # Sadly rpm-ostree in rhel8 right now doesn't support e.g. `rpm-ostree upgrade openshift-hyperkube`
+    # in a container https://github.com/coreos/rpm-ostree/issues/4034
+    RUN ls -al /etc/yum.repos.d && dnf -y install dnf-utils && dnf --disablerepo='*' --enablerepo=built download cri-o
+    # See also https://issues.redhat.com/browse/ART-4352
+    FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos-9
+    COPY --from=build /*.rpm /
+    # Also delete leftover RPM files; see https://issues.redhat.com/browse/OCPBUGS-6505.
+    RUN rpm -Uvh --oldpackage /*.rpm && rm -vf /*.rpm /usr/share/rpm/__db.* /usr/share/rpm/.*.lock
+  inputs:
+    base-machine-with-rpms:
+      as:
+      - quay.io/centos/centos:stream9
+    rhel-coreos-9-base:
+      as:
+      - registry.ci.openshift.org/rhcos-devel/rhel-coreos-9
+  to: rhel-coreos-9
+promotion:
+  to:
+  - additional_images:
+      cri-o-rpms: rpms
+    excluded_images:
+    - rhel-coreos-9
+    name: 4.22-priv
+    namespace: ocp-private
+raw_steps:
+- rpm_image_injection_step:
+    from: base-machine
+    to: base-machine-with-rpms
+releases:
+  initial:
+    integration:
+      name: 4.22-priv
+      namespace: ocp-private
+  latest:
+    integration:
+      include_built_images: true
+      name: 4.22-priv
+      namespace: ocp-private
+resources:
+  '*':
+    requests:
+      cpu: 100m
+      memory: 4Gi
+rpm_build_commands: hack/build-rpms.sh
+rpm_build_location: _output/local/releases/rpms
+tests:
+- as: e2e-aws-ovn
+  steps:
+    cluster_profile: aws-3
+    workflow: openshift-e2e-aws
+- as: e2e-gcp-ovn
+  steps:
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+zz_generated_metadata:
+  branch: release-4.22
+  org: openshift-priv
+  repo: cri-o
diff --git a/ci-operator/config/openshift-priv/cri-o/openshift-priv-cri-o-release-4.23.yaml b/ci-operator/config/openshift-priv/cri-o/openshift-priv-cri-o-release-4.23.yaml
@@ -0,0 +1,70 @@
+base_images:
+  base-machine:
+    name: centos
+    namespace: openshift
+    tag: stream9
+  rhel-coreos-9-base:
+    name: 4.23-priv
+    namespace: ocp-private
+    tag: rhel-coreos-9
+build_root:
+  image_stream_tag:
+    name: release
+    namespace: openshift
+    tag: rhel-9-release-golang-1.25-openshift-4.22
+canonical_go_repository: github.com/openshift/cri-o
+images:
+- dockerfile_literal: |
+    # This uses the new rhel-coreos-9 base image
+    # https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
+    FROM quay.io/centos/centos:stream9 as build
+    # Sadly rpm-ostree in rhel8 right now doesn't support e.g. `rpm-ostree upgrade openshift-hyperkube`
+    # in a container https://github.com/coreos/rpm-ostree/issues/4034
+    RUN ls -al /etc/yum.repos.d && dnf -y install dnf-utils && dnf --disablerepo='*' --enablerepo=built download cri-o
+    # See also https://issues.redhat.com/browse/ART-4352
+    FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos-9
+    COPY --from=build /*.rpm /
+    # Also delete leftover RPM files; see https://issues.redhat.com/browse/OCPBUGS-6505.
+    RUN rpm -Uvh --oldpackage /*.rpm && rm -vf /*.rpm /usr/share/rpm/__db.* /usr/share/rpm/.*.lock
+  inputs:
+    base-machine-with-rpms:
+      as:
+      - quay.io/centos/centos:stream9
+    rhel-coreos-9-base:
+      as:
+      - registry.ci.openshift.org/rhcos-devel/rhel-coreos-9
+  to: rhel-coreos-9
+raw_steps:
+- rpm_image_injection_step:
+    from: base-machine
+    to: base-machine-with-rpms
+releases:
+  initial:
+    integration:
+      name: 4.23-priv
+      namespace: ocp-private
+  latest:
+    integration:
+      include_built_images: true
+      name: 4.23-priv
+      namespace: ocp-private
+resources:
+  '*':
+    requests:
+      cpu: 100m
+      memory: 4Gi
+rpm_build_commands: hack/build-rpms.sh
+rpm_build_location: _output/local/releases/rpms
+tests:
+- as: e2e-aws-ovn
+  steps:
+    cluster_profile: aws-3
+    workflow: openshift-e2e-aws
+- as: e2e-gcp-ovn
+  steps:
+    cluster_profile: gcp
+    workflow: openshift-e2e-gcp
+zz_generated_metadata:
+  branch: release-4.23
+  org: openshift-priv
+  repo: cri-o
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml
@@ -465,6 +465,15 @@ tests:
     - chain: ipi-install
     test:
     - ref: openshift-e2e-test
+- as: e2e-aws-ovn-rhcos10-devpreview
+  optional: true
+  steps:
+    cluster_profile: aws-4
+    env:
+      AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
+      FEATURE_SET: DevPreviewNoUpgrade
+      OS_IMAGE_STREAM: rhel-10
+    workflow: openshift-e2e-aws
 - as: e2e-gcp-ovn
   run_if_changed: (gcp|google)
   steps:

diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.22.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.22.yaml
@@ -466,6 +466,15 @@ tests:
     - chain: ipi-install
     test:
     - ref: openshift-e2e-test
+- as: e2e-aws-ovn-rhcos10-devpreview
+  optional: true
+  steps:
+    cluster_profile: aws-4
+    env:
+      AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
+      FEATURE_SET: DevPreviewNoUpgrade
+      OS_IMAGE_STREAM: rhel-10
+    workflow: openshift-e2e-aws
 - as: e2e-gcp-ovn
   run_if_changed: (gcp|google)
   steps:

diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.23.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.23.yaml
@@ -465,6 +465,15 @@ tests:
     - chain: ipi-install
     test:
     - ref: openshift-e2e-test
+- as: e2e-aws-ovn-rhcos10-devpreview
+  optional: true
+  steps:
+    cluster_profile: aws-4
+    env:
+      AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
+      FEATURE_SET: DevPreviewNoUpgrade
+      OS_IMAGE_STREAM: rhel-10
+    workflow: openshift-e2e-aws
 - as: e2e-gcp-ovn
   run_if_changed: (gcp|google)
   steps:

diff --git a/...enshift-priv/multiarch-tuning-operator/openshift-priv-multiarch-tuning-operator-main.yaml b/...enshift-priv/multiarch-tuning-operator/openshift-priv-multiarch-tuning-operator-main.yaml
@@ -69,10 +69,10 @@ resources:
       memory: 1Gi
   sast:
     limits:
-      memory: 8Gi
+      memory: 20Gi
     requests:
-      cpu: 500m
-      memory: 1Gi
+      cpu: "8"
+      memory: 10Gi
 tests:
 - as: fmt
   capabilities:

diff --git a/...enshift-priv/multiarch-tuning-operator/openshift-priv-multiarch-tuning-operator-v1.x.yaml b/...enshift-priv/multiarch-tuning-operator/openshift-priv-multiarch-tuning-operator-v1.x.yaml
@@ -69,10 +69,10 @@ resources:
       memory: 1Gi
   sast:
     limits:
-      memory: 8Gi
+      memory: 20Gi
     requests:
-      cpu: 500m
-      memory: 1Gi
+      cpu: "8"
+      memory: 10Gi
 tests:
 - as: fmt
   capabilities: