Merge branch 'openshift-4.19' into consistent_overrides

openshift-eng · Feb 13, 2025 · 4dfce61 · 4dfce61
2 parents 83c1a23 + 9cd353b
commit 4dfce61
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/images/linuxptp-daemon.yml b/images/linuxptp-daemon.yml
@@ -4,7 +4,7 @@ arches:
 - ppc64le
 content:
   source:
-    dockerfile: Dockerfile.art
+    dockerfile: addons/redhat/Dockerfile.ocp
     git:
       branch:
         target: release-{MAJOR}.{MINOR}

diff --git a/images/openstack-resource-controller.yml b/images/openstack-resource-controller.yml
@@ -9,7 +9,7 @@ content:
     ci_alignment:
       streams_prs:
         ci_build_root:
-          stream: rhel-9-golang-ci-build-root
+          stream: ci-openshift-build-root-latest.rhel9
 distgit:
   branch: rhaos-{MAJOR}.{MINOR}-rhel-9
   component: openstack-resource-controller-container

diff --git a/images/ose-installer-artifacts.yml b/images/ose-installer-artifacts.yml
@@ -37,4 +37,4 @@ konflux:
     x86_64: linux-d160-c4xlarge/amd64
     aarch64: linux-d160-c4xlarge/arm64
     s390x: linux-largecpu/s390x
-    ppc64le: linux-d200-large/ppc64le
+    ppc64le: linux-d200-large/ppc64le