Skip to content

Commit

Permalink
Force CI to use 4.x:base-rhel?
Browse files Browse the repository at this point in the history
Before this change, reconciliation PRs were being opened
to reference registry.ci.openshift.org/ocp/4.19:openshift-enterprise-base-rhel9 .
Confusingly, we have previously opened PRs to use
registry.ci.openshift.org/ocp/4.x:base-rhel9 . This is not the same
as the ART base-rhel9, which is just an up-to-date ELS RHEL9 base
image.
CI expects this image to be our enterprise-base RHEL9 image.
  • Loading branch information
jupierce committed Dec 3, 2024
1 parent 2f21a08 commit fa079b6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
8 changes: 8 additions & 0 deletions images/openshift-base-rhel9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@ content:
ci_alignment:
streams_prs:
enabled: false
# The actual image used by CI for the base image is
# built and pushed from ci-openshift-base.rhel9.
# This image is technically, the openshift-enterprise-base image
# but it shouldn't matter for the purposes of CI
# Setting upstream_image here ensures that reconciliation PRs for components referencing
# this image as their base image will use the image created by
# ci-openshift-base.rhel9 and be able to resolve RPMs.
mirror: false
upstream_image: registry.ci.openshift.org/ocp/{MAJOR}.{MINOR}:base-rhel9
okd_alignment:
resolve_as:
stream: centos_stream9
Expand Down
7 changes: 7 additions & 0 deletions images/openshift-enterprise-base-rhel9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ content:
- approved
- lgtm
merge_first: true
# The actual image used by CI for the enterprise base image is
# built and pushed from ci-openshift-base.rhel9. Setting upstream_image
# here ensures that reconciliation PRs for components referencing
# this image as their base image will use the image created by
# ci-openshift-base.rhel9 and be able to resolve RPMs.
mirror: false
upstream_image: registry.ci.openshift.org/ocp/{MAJOR}.{MINOR}:base-rhel9
okd_alignment:
# The tag name in the okd stream to which this image should be promoted
tag_name: base-stream9
Expand Down

0 comments on commit fa079b6

Please sign in to comment.