From 431b4ae3e94f11a417d90229d58effb92fea4d8e Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 15 May 2025 05:08:37 +0000 Subject: Revert "mariadb: pin to 10.11.11" This reverts commit 535b2f270faf24cfa30b9aa1a896a62c5090f1aa. Reason for revert: 10.11.12 is revoked upstream Change-Id: I0a8cdc232e5b46cb47e4a3e1b0af7b2402103690 --- .zuul.d/debian.yaml | 4 ++-- .zuul.d/rocky.yaml | 8 ++++---- .zuul.d/ubuntu.yaml | 8 ++++---- docker/base/mariadb.repo | 2 +- kolla/template/repos.yaml | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml index 096c29f82..715e7acdc 100644 --- a/.zuul.d/debian.yaml +++ b/.zuul.d/debian.yaml @@ -5,7 +5,7 @@ - kolla-build-debian - kolla-build-debian-podman - kolla-ansible-debian - #- kolla-ansible-debian-upgrade + - kolla-ansible-debian-upgrade check-arm64: jobs: - kolla-build-debian-aarch64 @@ -15,7 +15,7 @@ - kolla-build-debian - kolla-build-debian-podman - kolla-ansible-debian - #- kolla-ansible-debian-upgrade + - kolla-ansible-debian-upgrade periodic: jobs: - kolla-publish-debian-quay diff --git a/.zuul.d/rocky.yaml b/.zuul.d/rocky.yaml index 727b654a7..bb9f6a8b1 100644 --- a/.zuul.d/rocky.yaml +++ b/.zuul.d/rocky.yaml @@ -5,12 +5,12 @@ - kolla-build-rocky9 - kolla-build-rocky9-podman - kolla-ansible-rocky9 - #- kolla-ansible-rocky9-upgrade + - kolla-ansible-rocky9-upgrade # Test rabbitmq and mariadb in multinode ceph jobs. - kolla-ansible-rocky9-cephadm: files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - #- kolla-ansible-rocky9-upgrade-cephadm: - # files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* + - kolla-ansible-rocky9-upgrade-cephadm: + files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - kolla-ansible-rocky9-ironic: files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* - kolla-ansible-rocky9-swift: @@ -39,7 +39,7 @@ - kolla-build-rocky9 - kolla-build-rocky9-podman - kolla-ansible-rocky9 - #- kolla-ansible-rocky9-upgrade + - kolla-ansible-rocky9-upgrade periodic: jobs: - kolla-publish-rocky9-quay diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index a1820d4d3..ebbc96bc6 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -5,12 +5,12 @@ - kolla-build-ubuntu - kolla-build-ubuntu-podman - kolla-ansible-ubuntu - #- kolla-ansible-ubuntu-upgrade + - kolla-ansible-ubuntu-upgrade # Test rabbitmq and mariadb in multinode ceph jobs. - kolla-ansible-ubuntu-cephadm: files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - #- kolla-ansible-ubuntu-upgrade-cephadm: - # files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* + - kolla-ansible-ubuntu-upgrade-cephadm: + files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - kolla-ansible-ubuntu-ironic: files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* - kolla-ansible-ubuntu-swift: @@ -39,7 +39,7 @@ - kolla-build-ubuntu - kolla-build-ubuntu-podman - kolla-ansible-ubuntu - #- kolla-ansible-ubuntu-upgrade + - kolla-ansible-ubuntu-upgrade periodic: jobs: - kolla-publish-ubuntu-quay diff --git a/docker/base/mariadb.repo b/docker/base/mariadb.repo index 4c03f4f40..07d97ef20 100644 --- a/docker/base/mariadb.repo +++ b/docker/base/mariadb.repo @@ -1,6 +1,6 @@ [mariadb] name = MariaDB Server -baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.11.11/yum/rhel/$releasever/$basearch +baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.11/yum/rhel/$releasever/$basearch gpgcheck = 1 enabled = 0 module_hotfixes = 1 diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index a88c8aff1..c549f76c5 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -67,7 +67,7 @@ debian: component: "stable" gpg_key: "influxdb.asc" mariadb: - url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.11/repo/debian" + url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian" suite: "bookworm" component: "main" gpg_key: "mariadb.gpg" @@ -119,7 +119,7 @@ debian-aarch64: component: "stable" gpg_key: "influxdb.asc" mariadb: - url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.11/repo/debian" + url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian" suite: "bookworm" component: "main" gpg_key: "mariadb.gpg" @@ -213,7 +213,7 @@ ubuntu: component: "stable" gpg_key: "influxdb.asc" mariadb: - url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.11/repo/ubuntu" + url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu" suite: "noble" component: "main" gpg_key: "mariadb.gpg" @@ -266,7 +266,7 @@ ubuntu-aarch64: component: "stable" gpg_key: "influxdb.asc" mariadb: - url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.11/repo/ubuntu" + url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu" suite: "noble" component: "main" gpg_key: "mariadb.gpg" -- cgit v1.2.3