From 761d58717731dd72ce50f6dbb6cd8e2b5e608060 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 29 Aug 2019 09:06:46 +0000
Subject: [PATCH] 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
---
 docker/base/Dockerfile.j2                                    | 4 +++-
 docker/base/sources.list.ubuntu                              | 3 +++
 docker/base/sources.list.ubuntu.aarch64                      | 3 +++
 docker/base/sources.list.ubuntu.ppc64le                      | 3 +++
 docker/mariadb/Dockerfile.j2                                 | 3 ++-
 .../notes/ubuntu-upstream-mariadb-34ce8106811a1f75.yaml      | 5 +++++
 6 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/ubuntu-upstream-mariadb-34ce8106811a1f75.yaml

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index b3c923b3f2..8f2ec86343 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -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',
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu
index 0e418a496b..3ffe3449b5 100644
--- a/docker/base/sources.list.ubuntu
+++ b/docker/base/sources.list.ubuntu
@@ -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
diff --git a/docker/base/sources.list.ubuntu.aarch64 b/docker/base/sources.list.ubuntu.aarch64
index ae29f5b897..7169349c10 100644
--- a/docker/base/sources.list.ubuntu.aarch64
+++ b/docker/base/sources.list.ubuntu.aarch64
@@ -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
diff --git a/docker/base/sources.list.ubuntu.ppc64le b/docker/base/sources.list.ubuntu.ppc64le
index 130d0a15d5..5ffe6e48e9 100644
--- a/docker/base/sources.list.ubuntu.ppc64le
+++ b/docker/base/sources.list.ubuntu.ppc64le
@@ -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
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2
index 4e2f57f489..55898dc18e 100644
--- a/docker/mariadb/Dockerfile.j2
+++ b/docker/mariadb/Dockerfile.j2
@@ -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 %}
diff --git a/releasenotes/notes/ubuntu-upstream-mariadb-34ce8106811a1f75.yaml b/releasenotes/notes/ubuntu-upstream-mariadb-34ce8106811a1f75.yaml
new file mode 100644
index 0000000000..252f49014e
--- /dev/null
+++ b/releasenotes/notes/ubuntu-upstream-mariadb-34ce8106811a1f75.yaml
@@ -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.