Skip to content

Add OCP 4.22 to prow #81081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tbuskey wants to merge 14 commits into from
Closed

Add OCP 4.22 to prow #81081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
da80c46
Add OCP 4.22 to prow
tbuskey Jun 25, 2026
da9e737
OSAC-1770: require jira/valid-reference label for merge across all OS…
eranco74 Jun 25, 2026
f818314
odh-dashboard: add run_if_changed to module PR image-mirror jobs (#81…
lucferbux Jun 25, 2026
8188678
feat: onboard opendatahub-io/ai-gateway-operator to prow (#81084)
chaitanya1731 Jun 25, 2026
f240fff
CNF-25270: Export LCA git coordinates to image-based remote scripts (…
fontivan Jun 25, 2026
2a5ec61
hypershift: fix upgrade test to use version-tagged HO image for relea…
devguyio Jun 25, 2026
d84e588
SPLAT-2588: hcp/aws returning TPNU job to weekly (#81080)
mtulio Jun 25, 2026
950d6e4
Move OCM FVT sanity jobs from presubmit to periodic (#81091)
dustman9000 Jun 25, 2026
0db4bb4
openshift-logging: Update Loki Operator 6.4 to Go 1.26 (#81093)
xperimental Jun 25, 2026
5063865
ci-operator: aro-hcp: fail on observability gather (#81096)
stevekuznetsov Jun 25, 2026
dc7c44d
openshift-logging: Add configuration for Loki 3.6.12 (#81086)
xperimental Jun 25, 2026
f891ec4
Add Trustee operator installation step for Confidential Containers (#…
tbuskey Jun 25, 2026
09279f4
Allow ci-scheduling-webhook cluster resources in core-ci AppProject (…
deepsm007 Jun 25, 2026
b534133
Debug: Set CATALOG_SOURCE_IMAGE to 1.12.1-1781886111 for aws-ipi-peer…
tbuskey Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ci-operator/config/opendatahub-io/odh-dashboard/opendatahub-io-odh-dashboard-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ tests:
IMAGE_REPO: odh-dashboard
workflow: opendatahub-io-ci-image-mirror
- as: odh-mod-arch-model-registry-pr-image-mirror
run_if_changed: ^packages/model-registry/
steps:
dependencies:
SOURCE_IMAGE_REF: odh-mod-arch-model-registry-image
Expand All @@ -86,6 +87,7 @@ tests:
RELEASE_VERSION: main
workflow: opendatahub-io-ci-image-mirror
- as: odh-mod-arch-gen-ai-pr-image-mirror
run_if_changed: ^packages/gen-ai/
steps:
dependencies:
SOURCE_IMAGE_REF: odh-mod-arch-gen-ai-image
Expand All @@ -102,6 +104,7 @@ tests:
RELEASE_VERSION: main
workflow: opendatahub-io-ci-image-mirror
- as: odh-mod-arch-maas-pr-image-mirror
run_if_changed: ^packages/maas/
steps:
dependencies:
SOURCE_IMAGE_REF: odh-mod-arch-maas-image
Expand All @@ -118,6 +121,7 @@ tests:
RELEASE_VERSION: main
workflow: opendatahub-io-ci-image-mirror
- as: odh-mod-arch-mlflow-pr-image-mirror
run_if_changed: ^packages/mlflow/
steps:
dependencies:
SOURCE_IMAGE_REF: odh-mod-arch-mlflow-image
Expand All @@ -134,6 +138,7 @@ tests:
RELEASE_VERSION: main
workflow: opendatahub-io-ci-image-mirror
- as: odh-mod-arch-eval-hub-pr-image-mirror
run_if_changed: ^packages/eval-hub/
steps:
dependencies:
SOURCE_IMAGE_REF: odh-mod-arch-eval-hub-image
Expand All @@ -150,6 +155,7 @@ tests:
RELEASE_VERSION: main
workflow: opendatahub-io-ci-image-mirror
- as: odh-mod-arch-automl-pr-image-mirror
run_if_changed: ^packages/automl/
steps:
dependencies:
SOURCE_IMAGE_REF: odh-mod-arch-automl-image
Expand All @@ -166,6 +172,7 @@ tests:
RELEASE_VERSION: main
workflow: opendatahub-io-ci-image-mirror
- as: odh-mod-arch-autorag-pr-image-mirror
run_if_changed: ^packages/autorag/
steps:
dependencies:
SOURCE_IMAGE_REF: odh-mod-arch-autorag-image
Expand All @@ -182,6 +189,7 @@ tests:
RELEASE_VERSION: main
workflow: opendatahub-io-ci-image-mirror
- as: odh-mod-arch-agent-ops-pr-image-mirror
run_if_changed: ^packages/agent-ops/
steps:
dependencies:
SOURCE_IMAGE_REF: odh-mod-arch-agent-ops-image
Expand Down
2 changes: 2 additions & 0 deletions ...g/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main__ocm-fvt-rosa-hcp-staging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ tests:
- as: ocm-fvt-periodic-cs-sanity-staging-main
capabilities:
- nested-podman
cron: 0 0 31 2 *
nested_podman: true
steps:
allow_best_effort_post_steps: true
Expand All @@ -248,6 +249,7 @@ tests:
- as: ocm-fvt-periodic-cs-sanity-jira-staging-main
capabilities:
- nested-podman
cron: 0 0 31 2 *
nested_podman: true
steps:
allow_best_effort_post_steps: true
Expand Down
2 changes: 1 addition & 1 deletion ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ base_images:
hypershift-operator-init:
name: hypershift-operator
namespace: hypershift
tag: latest
tag: "4.19"
hypershift-tests:
name: hypershift-tests
namespace: hypershift
Expand Down
2 changes: 1 addition & 1 deletion ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ base_images:
hypershift-operator-init:
name: hypershift-operator
namespace: hypershift
tag: latest
tag: "4.20"
hypershift-tests:
name: hypershift-tests
namespace: hypershift
Expand Down
2 changes: 1 addition & 1 deletion ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ base_images:
hypershift-operator-init:
name: hypershift-operator
namespace: hypershift
tag: latest
tag: "4.21"
hypershift-tests:
name: hypershift-tests
namespace: hypershift
Expand Down
2 changes: 1 addition & 1 deletion ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.22.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ base_images:
hypershift-operator-init:
name: hypershift-operator
namespace: hypershift
tag: latest
tag: "4.22"
hypershift-tests:
name: hypershift-tests
namespace: hypershift
Expand Down
8 changes: 7 additions & 1 deletion ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ base_images:
hypershift-operator-init:
name: hypershift-operator
namespace: hypershift
tag: latest
tag: "4.19"
hypershift-tests:
name: hypershift-tests
namespace: hypershift
Expand All @@ -30,6 +30,12 @@ promotion:
to:
- name: "4.19"
namespace: ocp
- additional_images:
hypershift-operator: hypershift-operator
excluded_images:
- '*'
namespace: hypershift
tag: "4.19"
releases:
initial:
candidate:
Expand Down
8 changes: 7 additions & 1 deletion ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ base_images:
hypershift-operator-init:
name: hypershift-operator
namespace: hypershift
tag: latest
tag: "4.20"
hypershift-tests:
name: hypershift-tests
namespace: hypershift
Expand All @@ -35,6 +35,12 @@ promotion:
to:
- name: "4.20"
namespace: ocp
- additional_images:
hypershift-operator: hypershift-operator
excluded_images:
- '*'
namespace: hypershift
tag: "4.20"
releases:
initial:
candidate:
Expand Down
8 changes: 7 additions & 1 deletion ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ base_images:
hypershift-operator-init:
name: hypershift-operator
namespace: hypershift
tag: latest
tag: "4.21"
hypershift-tests:
name: hypershift-tests
namespace: hypershift
Expand All @@ -38,6 +38,12 @@ promotion:
- hypershift-tests
name: "4.21"
namespace: ocp
- additional_images:
hypershift-operator: hypershift-operator
excluded_images:
- '*'
namespace: hypershift
tag: "4.21"
releases:
initial:
candidate:
Expand Down
8 changes: 7 additions & 1 deletion ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ base_images:
hypershift-operator-init:
name: hypershift-operator
namespace: hypershift
tag: latest
tag: "4.22"
hypershift-tests:
name: hypershift-tests
namespace: hypershift
Expand All @@ -33,6 +33,12 @@ promotion:
- hypershift-operator
name: "4.22"
namespace: ocp
- additional_images:
hypershift-operator: hypershift-operator
excluded_images:
- '*'
namespace: hypershift
tag: "4.22"
releases:
initial:
candidate:
Expand Down
2 changes: 1 addition & 1 deletion ci-operator/config/openshift/hypershift/openshift-hypershift-release-5.0__periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ tests:
- chain: hypershift-conformance
workflow: hypershift-aws-conformance
- as: e2e-aws-ovn-conformance-techpreview
interval: 6h
cron: '@weekly'
reporter_config:
channel: '#forum-ocp-splat-alerts-aws'
job_states_to_report:
Expand Down
6 changes: 3 additions & 3 deletions ci-operator/config/openshift/loki/openshift-loki-release-6.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ base_images:
go_builder:
name: builder
namespace: ocp
tag: rhel-9-golang-1.24-openshift-4.23
tag: rhel-9-golang-1.26-openshift-4.23
loki:
name: loki
namespace: logging
Expand All @@ -23,7 +23,7 @@ build_root:
image_stream_tag:
name: builder
namespace: ocp
tag: rhel-9-golang-1.24-openshift-4.23
tag: rhel-9-golang-1.26-openshift-4.23
use_build_cache: true
images:
items:
Expand All @@ -33,7 +33,7 @@ images:
inputs:
go_builder:
as:
- golang:1.24.4
- golang:1.26.3
to: loki-operator
- dockerfile_literal: |
FROM registry.redhat.io/ubi9/go-toolset:latest
Expand Down
51 changes: 51 additions & 0 deletions ci-operator/config/openshift/loki/openshift-loki-upstream-v3.6.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
base_images:
base:
name: "4.21"
namespace: ocp
tag: base-rhel9
build_root:
image_stream_tag:
name: builder
namespace: ocp
tag: rhel-9-golang-1.26-openshift-4.23
images:
items:
- additional_architectures:
- arm64
dockerfile_path: Dockerfile.ocp
from: base
to: loki
- additional_architectures:
- arm64
dockerfile_path: Dockerfile.promtail.ocp
from: base
to: promtail
promotion:
to:
- namespace: logging
tag: v3.6.12
releases:
latest:
release:
channel: stable
version: "4.21"
resources:
'*':
requests:
cpu: 100m
memory: 200Mi
tests:
- as: test
steps:
test:
- as: unit
commands: GOFLAGS="" make test
from: src
resources:
requests:
cpu: 100m
memory: 200Mi
zz_generated_metadata:
branch: upstream-v3.6.12
org: openshift
repo: loki
36 changes: 36 additions & 0 deletions ...tainers-operator/openshift-sandboxed-containers-operator-devel__downstream-candidate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
base_images:
cli:
name: "4.19"
namespace: ocp
tag: cli
tests-private:
name: tests-private
namespace: ci
Expand All @@ -7,6 +11,32 @@ base_images:
name: "4.19"
namespace: ocp
tag: upi-installer
build_root:
image_stream_tag:
name: builder
namespace: ocp
tag: rhel-9-golang-1.25-openshift-4.21
images:
items:
- dockerfile_literal: |
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
RUN microdnf install -y git tar gzip && microdnf clean all
RUN git clone --depth 1 --branch main \
https://github.com/confidential-devhub/charts /charts && \
rm -rf /charts/.git
Comment on lines +21 to +26

@coderabbitai coderabbitai Bot Jun 25, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🩺 Stability & Availability | 🟠 Major | ⚡ Quick win

Pin the helper image inputs to immutable versions.

ubi-minimal:latest and cloning confidential-devhub/charts from main make these candidate jobs non-reproducible, so an upstream change can silently alter or break the 4.17/4.18/4.19/default variants without any corresponding change here. Please pin the base image and charts revision to immutable values in all copied blocks.

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@ci-operator/config/openshift/sandboxed-containers-operator/openshift-sandboxed-containers-operator-devel__downstream-candidate.yaml`
around lines 21 - 26, The helper image definition is still using moving targets,
so update the dockerfile_literal blocks to use immutable references instead of
registry.access.redhat.com/ubi9/ubi-minimal:latest and the
confidential-devhub/charts main branch. Pin the base image in the helper image
setup and replace the git clone revision in the chart fetch step with a fixed
commit, tag, or release reference in all duplicated variant blocks (for example,
the downstream candidate and any copied 4.17/4.18/4.19/default definitions).
Keep the change consistent across the shared helper image configuration so the
same inputs are used everywhere.

to: trustee-charts
- dockerfile_literal: |
FROM this-is-ignored
USER root
RUN dnf install -y tar gzip jq skopeo git && dnf clean all
RUN curl -sL https://get.helm.sh/helm-v3.14.0-linux-amd64.tar.gz | tar xz && \
mv linux-amd64/helm /usr/local/bin/helm && \
rm -rf linux-amd64 && \
chmod +x /usr/local/bin/helm && \
helm version
USER 1000
from: cli
to: tools-with-helm
prowgen:
disable_sparse_checkout: true
releases:
Expand Down Expand Up @@ -127,6 +157,8 @@ tests:
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_TIMEOUT: "90"
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:1.1.0-1776506656
TRUSTEE_INSTALL: "true"
TRUSTEE_URL: ""
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-azure
Expand Down Expand Up @@ -204,6 +236,8 @@ tests:
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_TIMEOUT: "90"
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:1.1.0-1776506656
TRUSTEE_INSTALL: "true"
TRUSTEE_URL: ""
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-aro
Expand Down Expand Up @@ -278,6 +312,8 @@ tests:
TEST_RELEASE_TYPE: Pre-GA
TEST_SCENARIOS: sig-kata.*Kata Author
TEST_TIMEOUT: "90"
TRUSTEE_CATALOG_SOURCE_IMAGE: quay.io/redhat-user-workloads/ose-osc-tenant/trustee-test-fbc:1.1.0-1776506656
TRUSTEE_INSTALL: "true"
TRUSTEE_URL: ""
WORKLOAD_TO_TEST: coco
workflow: sandboxed-containers-operator-e2e-aws
Expand Down
Loading