From 7032a0d9ac2c875c5349708eb78b779473a41a6e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 22 Jan 2024 19:55:23 +0900
Subject: [PATCH] Stop using a specific mirror in infra

The host currently hard-coded is not functioning. This replaces
the hard-coded mirror by the local CI mirror detected. In case
mirror info is not available then upstream centos mirror is used.

Change-Id: I96a8cb45154c9dbb50efecc22d34c4ff75c6722a
---
 devstack/lib/ironic     | 8 ++++++++
 zuul.d/ironic-jobs.yaml | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index aa0b4fcdb4..3487842bfc 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -686,6 +686,14 @@ if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then
             die $LINENO "Grub2 Bootloader and Shim file missing."
         fi
     fi
+
+    # NOTE(tkajinam) Use local mirror in CI
+    if [ -f /etc/ci/mirror_info.sh ]; then
+        source /etc/ci/mirror_info.sh
+        CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}/centos-stream"
+        IRONIC_GRUB2_SHIM_FILE=$(echo $IRONIC_GRUB2_SHIM_FILE | sed  "s|https://mirror.stream.centos.org|${CENTOS_MIRROR_HOST}|g")
+        IRONIC_GRUB2_FILE=$(echo $IRONIC_GRUB2_FILE | sed  "s|https://mirror.stream.centos.org|${CENTOS_MIRROR_HOST}|g")
+    fi
 fi
 
 # TODO(pas-ha) find a way to (cross-)sign the custom CA bundle used by tls-proxy
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 6ef8a6ec94..5de4ed5b72 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -303,8 +303,8 @@
         # result and makes this job VERY sensitive to heavy disk IO of the
         # underlying hypervisor/cloud.
         IRONIC_CALLBACK_TIMEOUT: 800
-        IRONIC_GRUB2_SHIM_FILE: https://mirror.iad3.inmotion.opendev.org/centos-stream/9-stream/BaseOS/x86_64/os/EFI/BOOT/BOOTX64.EFI
-        IRONIC_GRUB2_FILE: https://mirror.iad3.inmotion.opendev.org/centos-stream/9-stream/BaseOS/x86_64/os/EFI/BOOT/grubx64.efi
+        IRONIC_GRUB2_SHIM_FILE: https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/EFI/BOOT/BOOTX64.EFI
+        IRONIC_GRUB2_FILE: https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/EFI/BOOT/grubx64.efi
         IRONIC_GRUB2_CONFIG_PATH: EFI/BOOT/grub.cfg
         IRONIC_REDFISH_EMULATOR_FEATURE_SET: vmedia
       devstack_services: