Move to MariaDB upstream repo and new version (10.3) on Ubuntu

MariaDB in Ubuntu packages is backlevel (10.1).
Devstack gates are tested on MySQL 5.7 which is not compatible
with MariaDB 10.1.
Neutron recently introduced a db migration
that breaks on MariaDB 10.1, but works on MariaDB 10.3 [0].

Bumping up version to 10.3 on Ubuntu to match CentOS (RDO) version.

[0]: https://review.opendev.org/#/c/677221/

Closes-Bug: #1841907
Change-Id: I16e4c40208912691e3015bfe2065ea0ce2358edb
This commit is contained in:
Michal Nasiadka 2019-08-29 09:06:46 +00:00 committed by Radosław Piliszek
parent 857cf3effc
commit 761d587177
6 changed files with 19 additions and 2 deletions

View File

@ -347,6 +347,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
{# 4D8EB5FDA37AB55F41A135203BF88A0C6A770882 -- Apache Qpid PPA Signing Key <dev@qpid.apache.org> #}
{# 901F9177AB97ACBE -- Treasure Data, Inc (Treasure Agent Official Signing key) <support@treasure-data.com> #}
{# A20F259AEB9C94BB -- Sensuapp (Freight) <support@hw-ops.com> #}
{# F1656F24C74CD1D8 -- MariaDB Signing Key <signing-key@mariadb.org> #}
{% set base_apt_keys = [
'391A9AA2147192839E9DB0315EDB1B62EC4926EA',
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
@ -355,7 +356,8 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
'58118E89F3A912897C070ADBF76221572C52609D',
'4D8EB5FDA37AB55F41A135203BF88A0C6A770882',
'901F9177AB97ACBE',
'A20F259AEB9C94BB'
'A20F259AEB9C94BB',
'F1656F24C74CD1D8',
] %}
{% set remote_apt_keys = [
'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey',

View File

@ -39,3 +39,6 @@ deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
# Percona XtraBackup repo
# NOTE(yoctozepto): enabled only in the xtrabackup image (to spare MariaDB deps and allow Zuul override)
#deb http://repo.percona.com/apt bionic main
# MariaDB repo
deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main

View File

@ -18,3 +18,6 @@ deb https://packages.grafana.com/oss/deb stable main
# elasticsearch (arch:all), logstash (arch:all), kibana (arch:amd64)
deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main
# MariaDB repo
deb [arch=arm64] http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main

View File

@ -12,3 +12,6 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/train main
# rabbitmq repo
deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
# MariaDB repo
deb [arch=ppc64el] http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main

View File

@ -32,7 +32,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% else %}
{% set mariadb_packages = mariadb_packages + [
'mariadb-server',
'mariadb-client'
'mariadb-client',
'mariadb-backup',
] %}
{% endif %}
{% endif %}

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
In Ubuntu images, MariaDB has been upgraded from 10.1 to 10.3.
As usual, ensure that all data has been backed up prior to upgrading.