fix('openshift#6552'): More References to registry.ci.openshift.org

ArthurVardevanyan · Aug 1, 2024 · 9865790 · 9865790
1 parent 77c8d88
commit 9865790
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -72,7 +72,7 @@ CHECK_CLUSTER_VERSION := $(or ${CHECK_CLUSTER_VERSION},False)
 ENABLE_SINGLE_NODE_DNSMASQ := $(or ${ENABLE_SINGLE_NODE_DNSMASQ},True)
 DISK_ENCRYPTION_SUPPORT := $(or ${DISK_ENCRYPTION_SUPPORT},True)
 DELETE_PVC := $(or ${DELETE_PVC},False)
-TESTING_PUBLIC_CONTAINER_REGISTRIES := quay.io
+TESTING_PUBLIC_CONTAINER_REGISTRIES := quay.io,registry.ci.openshift.org
 PUBLIC_CONTAINER_REGISTRIES := $(or ${PUBLIC_CONTAINER_REGISTRIES},$(TESTING_PUBLIC_CONTAINER_REGISTRIES))
 PODMAN_PULL_FLAG := $(or ${PODMAN_PULL_FLAG},--pull always)
 ENABLE_KUBE_API := $(or ${ENABLE_KUBE_API},false)

diff --git a/deploy/operator/setup_assisted_operator.sh b/deploy/operator/setup_assisted_operator.sh
@@ -80,7 +80,7 @@ EOF
 
     if [ -n "${PUBLIC_CONTAINER_REGISTRIES:-}" ]; then
 cat <<EOF
-  PUBLIC_CONTAINER_REGISTRIES: 'quay.io,${PUBLIC_CONTAINER_REGISTRIES}'
+  PUBLIC_CONTAINER_REGISTRIES: 'quay.io,registry.ci.openshift.org,${PUBLIC_CONTAINER_REGISTRIES}'
 EOF
     fi
     if [ -n "${ALLOW_CONVERGED_FLOW:-}" ]; then

diff --git a/deploy/podman/configmap-disconnected.yml b/deploy/podman/configmap-disconnected.yml
@@ -26,7 +26,7 @@ data:
   POSTGRESQL_DATABASE: installer
   POSTGRESQL_PASSWORD: admin
   POSTGRESQL_USER: admin
-  PUBLIC_CONTAINER_REGISTRIES: 'quay.io'
+  PUBLIC_CONTAINER_REGISTRIES: 'quay.io,registry.ci.openshift.org'
   RELEASE_IMAGES: '[{"openshift_version":"4.10","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"<container image registry server:port>/ocp4/openshift4:4.10.22-x86_64","version":"4.10.22","default":true}]'
   SERVICE_BASE_URL: http://<IP address of assisted installer host>:8090
   STORAGE: filesystem

diff --git a/deploy/podman/configmap_tls.yml b/deploy/podman/configmap_tls.yml
@@ -30,7 +30,7 @@ data:
   POSTGRESQL_DATABASE: installer
   POSTGRESQL_PASSWORD: admin
   POSTGRESQL_USER: admin
-  PUBLIC_CONTAINER_REGISTRIES: 'quay.io'
+  PUBLIC_CONTAINER_REGISTRIES: 'quay.io,registry.ci.openshift.org'
   RELEASE_IMAGES: '[{"openshift_version":"4.10","cpu_architecture":"x86_64","cpu_architectures":["x86_64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.28-x86_64","version":"4.10.28"},{"openshift_version":"4.10","cpu_architecture":"arm64","cpu_architectures":["arm64"],"url":"quay.io/openshift-release-dev/ocp-release:4.10.28-aarch64","version":"4.10.28"},{"openshift_version":"4.11","cpu_architecture":"multi","cpu_architectures":["x86_64","arm64","ppc64le","s390x"],"url":"quay.io/openshift-release-dev/ocp-release:4.11.0-multi","version":"4.11.0","default":true}]'
   SERVICE_BASE_URL: https://127.0.0.1:8090
   STORAGE: filesystem