Skip to content

Commit

Permalink
Merge pull request #5743 from joepvd/fix-multi-sync
Browse files Browse the repository at this point in the history
Start relying on ci base image for CI
  • Loading branch information
openshift-merge-bot[bot] authored Nov 26, 2024
2 parents 97194f5 + c3f34fc commit 58af686
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions images/openshift-base-rhel9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,7 @@ content:
ci_alignment:
streams_prs:
enabled: false
mirror: true
# The upstream_image_base serves as a starting point for the upstream_image.
# ART will mirror the brew build out to upstream_image_base.
# ART does not mirror the upstream_image in this case. A buildconfig,
# generated by images:streams is triggered when upstream_image_base is updated.
# The output of this buildconfig is upstream_image.
# This buildconfig layers on files necessary for the resulting upstream_image CI image
# to pull RPM dependencies from the CDN & reposync repositories.
upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-{MAJOR}.{MINOR}.art
# Note that it must be qualified by {MAJOR}.{MINOR} so that it installs non-CDN
# rpms for the appropriate release.
transform: rhel-9/base-repos
upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-{MAJOR}.{MINOR}
mirror: false
okd_alignment:
resolve_as:
stream: centos_stream9
Expand Down

0 comments on commit 58af686

Please sign in to comment.