aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2025-05-07 10:44:39 +0200
committerMichal Nasiadka <mnasiadka@gmail.com>2025-05-07 19:21:28 +0000
commit535b2f270faf24cfa30b9aa1a896a62c5090f1aa (patch)
treea7539c2197c41d51a50dcf8085d26c2033454f1a
parent02c54efb42251235d421269e66ae7f5b30d7e4e9 (diff)
downloadkolla-535b2f270faf24cfa30b9aa1a896a62c5090f1aa.tar.gz
kolla-535b2f270faf24cfa30b9aa1a896a62c5090f1aa.zip
mariadb: pin to 10.11.11
Temporarily disable upgrade jobs to get epoxy rc1 branched this week. Closes-Bug: #2110122 Change-Id: If301b9ebd7d0dc38bea4d60467e8e80a7a49825d
-rw-r--r--.zuul.d/debian.yaml4
-rw-r--r--.zuul.d/rocky.yaml8
-rw-r--r--.zuul.d/ubuntu.yaml8
-rw-r--r--docker/base/mariadb.repo2
-rw-r--r--kolla/template/repos.yaml8
5 files changed, 15 insertions, 15 deletions
diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml
index 715e7acdc..096c29f82 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 bb9f6a8b1..727b654a7 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 ebbc96bc6..a1820d4d3 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 07d97ef20..4c03f4f40 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/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
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index c549f76c5..a88c8aff1 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/repo/debian"
+ url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.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/repo/debian"
+ url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.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/repo/ubuntu"
+ url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.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/repo/ubuntu"
+ url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.11/repo/ubuntu"
suite: "noble"
component: "main"
gpg_key: "mariadb.gpg"