Add upstream_images for builder images

openshift-eng · Dec 2, 2024 · f16b547 · f16b547
1 parent 0bbea6d
commit f16b547
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/group.yml b/group.yml
@@ -535,7 +535,7 @@ canonical_builders_from_upstream: True
 # builders are not yet set up correctly for the release at branch cut time, and we want to limit
 # the churn.
 reconciliation_prs:
-  enabled: false
+  enabled: true
 
 # To decide whether to build and use signed RPMs, and to decide if a strict bug validation flow is necessary.
 # Possible values are defined here: https://github.com/openshift-eng/art-tools/blob/main/artcommon/artcommonlib/release_util.py#L55-L59

diff --git a/images/ose-cluster-config-api.yml b/images/ose-cluster-config-api.yml
@@ -10,6 +10,8 @@ content:
       streams_prs:
         ci_build_root:
           stream: rhel-9-golang-ci-build-root
+    okd_alignment:
+      run_if_changed: '^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$'
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: ose-cluster-config-api-container

diff --git a/streams.yml b/streams.yml
@@ -22,24 +22,36 @@ rhel-8-golang-1.22:
   - rhel-8-golang-{GO_PREVIOUS}
   image: openshift/golang-builder:v1.22.9-202411201508.gd54e8ac.el8
   mirror: false
+  # Since mirror: false, an images/ci-openshift-golang-builder* metadata must push to this location.
+  # upstream_image informs reconciliation PRs which upstream image to use for CI when this stream is referenced.
+  upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_PREVIOUS}-openshift-{MAJOR}.{MINOR}
 
 rhel-9-golang-1.22:
   aliases:
   - rhel-9-golang-{GO_PREVIOUS}
   image: openshift/golang-builder:v1.22.9-202411201508.gfa4fc3b.el9
   mirror: false
+  # Since mirror: false, an images/ci-openshift-golang-builder* metadata must push to this location.
+  # upstream_image informs reconciliation PRs which upstream image to use for CI when this stream is referenced.
+  upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_PREVIOUS}-openshift-{MAJOR}.{MINOR}
 
 rhel-9-golang:
   aliases:
   - rhel-9-golang-{GO_LATEST}
   image: openshift/golang-builder:v1.23.2-202411222126.g971a316.el9
   mirror: false
+  # Since mirror: false, an images/ci-openshift-golang-builder* metadata must push to this location.
+  # upstream_image informs reconciliation PRs which upstream image to use for CI when this stream is referenced.
+  upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR}
 
 rhel-8-golang:
   aliases:
   - rhel-8-golang-{GO_LATEST}
   image: openshift/golang-builder:v1.23.2-202411290846.g6707acc.el8
   mirror: false
+  # Since mirror: false, an images/ci-openshift-golang-builder* metadata must push to this location.
+  # upstream_image informs reconciliation PRs which upstream image to use for CI when this stream is referenced.
+  upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR}
 
 partner-rhel-8-golang-1.23:
   image: openshift/golang-builder:v1.23.2-202411290846.g6707acc.el8