Merge "Drop Percona XtraBackup in favour of MariaDB Backup"

6 files changed, 9 insertions, 67 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 209b191e6..395ebb043 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -80,12 +80,10 @@ COPY yum.conf /etc/yum.conf
         'grafana.repo',
         'influxdb.repo',
         'opendaylight.repo',
-        'percona-release.repo',
         'rabbitmq_rabbitmq-server.repo',
         'td.repo'
     ] %}
 
-    ## NOTE(yoctozepto): Percona keys omitted on purpose (handled via the repo file for compatibility with Zuul)
     {% set base_yum_repo_keys = [
         'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
         'https://packages.grafana.com/gpg.key',
@@ -345,7 +343,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
     {# 391A9AA2147192839E9DB0315EDB1B62EC4926EA -- Canonical Cloud Archive Signing Key <ftpmaster@canonical.com> #}
     {# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) <dev_ops@elasticsearch.org> #}
     {# 49B07274951063870A8B7EAE7B8AA1A344C05248 -- Opendaylight Signing Key <https://launchpad.net/~odl-team> #}
-    {# 4D1BB29D63D98E422B2113B19334A25F8507EFA5 -- Percona MySQL Development Team (Packaging key) <mysql-dev@percona.com> #}
     {# 58118E89F3A912897C070ADBF76221572C52609D -- Docker Release Tool (releasedocker) <docker@docker.com> #}
     {# 4D8EB5FDA37AB55F41A135203BF88A0C6A770882 -- Apache Qpid PPA Signing Key <dev@qpid.apache.org> #}
     {# 901F9177AB97ACBE                         -- Treasure Data, Inc (Treasure Agent Official Signing key) <support@treasure-data.com> #}
@@ -355,7 +352,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
       '391A9AA2147192839E9DB0315EDB1B62EC4926EA',
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
       '49B07274951063870A8B7EAE7B8AA1A344C05248',
-      '4D1BB29D63D98E422B2113B19334A25F8507EFA5',
       '58118E89F3A912897C070ADBF76221572C52609D',
       '4D8EB5FDA37AB55F41A135203BF88A0C6A770882',
       '901F9177AB97ACBE',
@@ -370,7 +366,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
 {% elif base_distro == 'debian' %}
     {% set base_apt_keys = [
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
-      '4D1BB29D63D98E422B2113B19334A25F8507EFA5',
     ] %}
     {% set remote_apt_keys = [
       'https://download.docker.com/linux/debian/gpg',
diff --git a/docker/base/percona-release.repo b/docker/base/percona-release.repo
deleted file mode 100644
index 74bb1623a..000000000
--- a/docker/base/percona-release.repo
+++ /dev/null
@@ -1,15 +0,0 @@
-[percona-release-$basearch]
-name = Percona-Release YUM repository - $basearch
-baseurl = https://repo.percona.com/release/$releasever/RPMS/$basearch
-enabled = 0
-gpgcheck = 1
-gpgkey = https://repo.percona.com/yum/RPM-GPG-KEY-Percona
-         https://repo.percona.com/yum/PERCONA-PACKAGING-KEY
-
-[percona-release-noarch]
-name = Percona-Release YUM repository - noarch
-baseurl = https://repo.percona.com/release/$releasever/RPMS/noarch
-enabled = 0
-gpgcheck = 1
-gpgkey = https://repo.percona.com/yum/RPM-GPG-KEY-Percona
-         https://repo.percona.com/yum/PERCONA-PACKAGING-KEY
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu
index 3ffe3449b..4e8e4d121 100644
--- a/docker/base/sources.list.ubuntu
+++ b/docker/base/sources.list.ubuntu
@@ -36,9 +36,5 @@ deb http://ppa.launchpad.net/odl-team/carbon/ubuntu xenial main
 # rabbitmq repo
 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/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2
index 55898dc18..7fa09a30d 100644
--- a/docker/mariadb/Dockerfile.j2
+++ b/docker/mariadb/Dockerfile.j2
@@ -23,19 +23,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% elif base_package_type == 'deb' %}
     {% set mariadb_packages = [
-        'expect'
+        'expect',
+        'mariadb-backup',
+        'mariadb-client',
+        'mariadb-server'
     ] %}
-    {% if base_distro == 'debian' %}
-        {% set mariadb_packages = mariadb_packages + [
-            'mariadb-server'
-        ] %}
-    {% else %}
-        {% set mariadb_packages = mariadb_packages + [
-            'mariadb-server',
-            'mariadb-client',
-            'mariadb-backup',
-        ] %}
-    {% endif %}
 {% endif %}
 
 {{ macros.install_packages(mariadb_packages | customizable("packages")) }}
@@ -53,6 +45,9 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 RUN mkdir -p /var/run/mysqld && chown mysql /var/run/mysqld && chmod 755 /var/run/mysqld
 {% endif %}
 
+COPY backup.sh /usr/local/bin/kolla_mariadb_backup.sh
+RUN chmod 755 /usr/local/bin/kolla_mariadb_backup.sh
+
 {% if use_dumb_init %}
 {% block mariadb_entrypoint %}
 # NOTE(mgoddard): Override the dumb-init arguments to avoid passing
diff --git a/docker/xtrabackup/backup.sh b/docker/mariadb/backup.sh
index f8dff8bd7..8c494a5eb 100755..100644
--- a/docker/xtrabackup/backup.sh
+++ b/docker/mariadb/backup.sh
@@ -5,7 +5,7 @@ set -eu
 # Execute a full backup
 backup_full() {
     echo "Taking a full backup"
-    innobackupex --defaults-file=/etc/mysql/my.cnf \
+    mariabackup --defaults-file=/etc/mysql/my.cnf \
         --no-timestamp \
         --stream=xbstream \
         --compress \
@@ -16,7 +16,7 @@ backup_full() {
 # Execute an incremental backup
 backup_incremental() {
     echo "Taking an incremental backup"
-    innobackupex --defaults-file=/etc/mysql/my.cnf \
+    mariabackup --defaults-file=/etc/mysql/my.cnf \
         --no-timestamp \
         --stream=xbstream \
         --compress \
@@ -46,4 +46,3 @@ else
     echo "You need to specify either full or incremental backup options."
     exit 1
 fi
-
diff --git a/docker/xtrabackup/Dockerfile.j2 b/docker/xtrabackup/Dockerfile.j2
deleted file mode 100644
index 341a0d2f3..000000000
--- a/docker/xtrabackup/Dockerfile.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block xtrabackup_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-RUN yum-config-manager --enable percona-release-\*
-{% endif %}
-
-{% if base_package_type == 'deb' %}
-RUN sed -i -e '/percona/ s|^#deb |deb |' /etc/apt/sources.list
-{% endif %}
-
-{% if base_package_type in ['rpm', 'deb'] %}
-    {% set xtrabackup_packages = ['percona-xtrabackup-24', 'qpress'] %}
-{% endif %}
-
-{{ macros.install_packages(xtrabackup_packages | customizable("packages")) }}
-
-COPY backup.sh /usr/local/bin/kolla_mariadb_backup.sh
-RUN chmod 755 /usr/local/bin/kolla_mariadb_backup.sh
-
-CMD /usr/local/bin/kolla_mariadb_backup.sh
-
-{% block xtrabackup_footer %}{% endblock %}
-{% block footer %}{% endblock %}