From d2f36dcdbdbaa8b77e80508f4d7c69408795e173 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: 2025年10月30日 08:58:29 +0100 Subject: [PATCH] Fix openstack-ci-mirrors element for CentOS Stream CentOS Stream 9 has actually been mirrored for years [1] and is currently the only release available. Revert the logic so that DIB_DISTRIBUTION_MIRROR and DIB_EPEL_MIRROR are set when using 9-stream. This should make 9-stream builds finally use CI mirrors and also fix any 10-stream image builds using this element (for example in Kayobe CI). [1] https://review.opendev.org/c/opendev/system-config/+/817900 Change-Id: I1bcb6d972d7d7771257ddc1cb3870fbe3e3db65d Signed-off-by: Pierre Riteau --- .../environment.d/11-dib-distribution-mirror.bash | 3 --- 1 file changed, 3 deletions(-) diff --git a/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash b/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash index 6f85c9322..91288eecd 100644 --- a/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash +++ b/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash @@ -32,9 +32,6 @@ elif [[ "${DISTRO_NAME}" == "debian" ]]; then export DIB_DEBOOTSTRAP_EXTRA_ARGS+=" --no-check-gpg" elif [[ "${DISTRO_NAME}" == "centos" ]]; then if [[ "${DIB_RELEASE}" == '9-stream' ]]; then - # NOTE(ianw) 2021年10月18日 : no 9-stream mirrors, yet - : - else export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_CENTOS_MIRROR export DIB_EPEL_MIRROR=$NODEPOOL_EPEL_MIRROR fi

AltStyle によって変換されたページ (->オリジナル) /