openstack/kolla
Code Issues Proposed changes

mariadb: pin to 10.11.11

Browse Source 
Marking bifrost as unbuildable has been included in this
change.
Bifrost is failing because it's trying to fetch
stable/2023.2 instead of an EOL tag.

Closes-Bug: #2110122

Change-Id: If301b9ebd7d0dc38bea4d60467e8e80a7a49825d
This commit is contained in:
Michal Nasiadka
2025-05-07 10:44:39 +02:00
parent fe9c55be40
commit b0cd0dfe6e
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/mariadb.repo
View File

@@ -1,6 +1,6 @@
[mariadb]
name = MariaDB Server
baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.11/yum/rhel/$releasever/$basearch
baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.11.11/yum/rhel/$releasever/$basearch
gpgcheck = 1
enabled = 0
module_hotfixes = 1

4
kolla/image/unbuildable.py
View File

@@ -24,6 +24,7 @@ UNBUILDABLE_IMAGES = {
# Issues for SHA1 keys:
# https://github.com/grafana/grafana/issues/41036
'centos': {
"bifrost-base", # Using missing branch instead of EOL tag
"hacluster-pcs", # Missing crmsh package
"nova-spicehtml5proxy", # Missing spicehtml5 package
"ovsdpdk", # Not supported on CentOS
@@ -31,11 +32,13 @@ UNBUILDABLE_IMAGES = {
},
'debian': {
"bifrost-base", # Using missing branch instead of EOL tag
"openvswitch-netcontrold",
# https://bugs.launchpad.net/kolla/+bug/2027668
},
'rocky': {
"bifrost-base", # Using missing branch instead of EOL tag
"collectd", # Missing libpqos.so.4()(64bit)
"hacluster-pcs", # Missing crmsh package
"nova-spicehtml5proxy", # Missing spicehtml5 package
@@ -44,6 +47,7 @@ UNBUILDABLE_IMAGES = {
},
'ubuntu': {
"bifrost-base", # Using missing branch instead of EOL tag
},
'ubuntu+aarch64': {

8
kolla/template/repos.yaml
View File

@@ -60,7 +60,7 @@ debian:
component: "stable"
gpg_key: "influxdb.asc"
mariadb:
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.11/repo/debian"
suite: "bookworm"
component: "main"
gpg_key: "mariadb.gpg"
@@ -107,7 +107,7 @@ debian-aarch64:
component: "stable"
gpg_key: "influxdb.asc"
mariadb:
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.11/repo/debian"
suite: "bookworm"
component: "main"
gpg_key: "mariadb.gpg"
@@ -193,7 +193,7 @@ ubuntu:
component: "stable"
gpg_key: "influxdb.asc"
mariadb:
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu"
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.11/repo/ubuntu"
suite: "jammy"
component: "main"
gpg_key: "mariadb.gpg"
@@ -240,7 +240,7 @@ ubuntu-aarch64:
component: "stable"
gpg_key: "influxdb.asc"
mariadb:
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu"
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.11/repo/ubuntu"
suite: "jammy"
component: "main"
gpg_key: "mariadb.gpg"