From fb7de5866de5e9c57146ff7d59c53e42df112ffe Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Mon, 4 Nov 2024 13:46:21 +0100
Subject: [PATCH] Remove usage of mariadb.com infra mirror

Current mariadb.com mirror that's being cached by infra does not
contain modern MariaDB versions and can't be used any longer for
testing.

Once we switch to mariadb.org and infra configuration will be in place,
we should return usage of local cached mirror.

It also unconditionally re-configures AIO during upgrade as we
need to remove usage of CI mirrors there after N-1 deployment
is done

Needed-By: https://review.opendev.org/c/openstack/openstack-ansible-galera_server/+/924354
Change-Id: I0af801c64b23107cafe99ac27f22f50ca669d26e
---
 scripts/gate-check-commit.sh                       | 14 +++++++-------
 .../bootstrap-host/tasks/prepare_aio_config.yml    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index 6729f0b7bb..cac2c03ed9 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -266,13 +266,13 @@ if [[ "${ACTION}" =~ "upgrade" ]]; then
       ln -s $ZUUL_SRC_PATH /openstack/src
     fi
     # Update AIO config files for certain scenarios
-    for item in "${SCENARIOS_WITH_CONFIG_UPDATE[@]}"; do
-      if [[ "${SCENARIO}" =~ "${item}" ]]; then
-        export BOOTSTRAP_EXTRA_PARAMS="${BOOTSTRAP_EXTRA_PARAMS:-} -t prepare-aio-config"
-        "${OSA_CLONE_DIR}/scripts/bootstrap-aio.sh"
-        break
-      fi
-    done
+    # for item in "${SCENARIOS_WITH_CONFIG_UPDATE[@]}"; do
+    #   if [[ "${SCENARIO}" =~ "${item}" ]]; then
+    export BOOTSTRAP_EXTRA_PARAMS="${BOOTSTRAP_EXTRA_PARAMS:-} -t prepare-aio-config"
+    "${OSA_CLONE_DIR}/scripts/bootstrap-aio.sh"
+    #     break
+    #   fi
+    # done
     # To execute the upgrade script we need to provide
     # an affirmative response to the warning that the
     # upgrade is irreversable.
diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
index e86dfd69ec..77a4ce1eea 100644
--- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
@@ -82,7 +82,7 @@
         nodepool_overrides:
           openstack_hosts_centos_mirror_url: "{{ nodepool_vars.NODEPOOL_CENTOS_MIRROR }}"
           centos_epel_mirror: "{{ nodepool_vars.NODEPOOL_EPEL_MIRROR }}"
-          galera_repo_host: "{{ nodepool_vars.NODEPOOL_MIRROR_HOST }}:8080"
+          # galera_repo_host: "{{ nodepool_vars.NODEPOOL_MIRROR_HOST }}:8080"
           nova_virt_type: 'qemu'
           # NOTE(jrosser)
           # we only run ceph jobs on ubuntu in CI so this is sufficient