Merge "Use MariaDB 10.6"

Author: Zuul

docker/base/mariadb-aarch64.repo

@@ -1,6 +1,6 @@
 [mariadb]
 name = MariaDB
-baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.5/yum/centos8-aarch64
+baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.6/yum/centos8-aarch64
 module_hotfixes = 1
 gpgcheck = 1
 enabled = 0

docker/base/mariadb.repo

@@ -1,6 +1,6 @@
 [mariadb]
 name = MariaDB
-baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.5/yum/centos8-amd64
+baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.6/yum/centos8-amd64
 module_hotfixes = 1
 gpgcheck = 1
 enabled = 0

kolla/template/repos.yaml

@@ -75,7 +75,7 @@ debian:
     component: "main"
     gpg_key: "elasticsearch.asc"
   mariadb:
-    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/debian"
+    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/debian"
     suite: "bullseye"
     component: "main"
     gpg_key: "mariadb.gpg"
@@ -128,7 +128,7 @@ debian-aarch64:
     component: "main"
     gpg_key: "elasticsearch.asc"
   mariadb:
-    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/debian"
+    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/debian"
     suite: "bullseye"
     component: "main"
     gpg_key: "mariadb.gpg"
@@ -185,7 +185,7 @@ ubuntu:
     component: "main"
     gpg_key: "elasticsearch.asc"
   mariadb:
-    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/ubuntu"
+    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "mariadb.gpg"
@@ -237,7 +237,7 @@ ubuntu-aarch64:
     component: "main"
     gpg_key: "elasticsearch.asc"
   mariadb:
-    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/ubuntu"
+    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "mariadb.gpg"

releasenotes/notes/mariadb-10.6-c79b0ad5791256ad.yaml

@@ -0,0 +1,4 @@
+---
+other:
+  - |
+    Images now have MariaDB 10.6.