commit d95d7afe5290824348fb264ee83dfbb1508ee5d1
author Valeriy Sakharov <vsakharov@mirantis.com> Wed Jan 26 15:22:27 2022 +0400
committer Denis Meltsaykin <dmeltsaykin@mirantis.com> Wed Feb 09 09:22:04 2022 +0000
tree ca4bee628cae4f1d108a855f7597ffe627764ad4
parent c8b649725b86f39d461f30b505875e2642823e0f

Update xtrabackup to 2.4

For the updating of MySQL package we need also update
percona-xtrabackup

Closes-Bug: PROD-36708
Change-Id: Iaa860cc3ff348c46d3d5b7ff7c6f2c28a1b248d1
(cherry picked from commit 8566c5740d127f4f0e536e571521d3b39250a437)

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 60152f2..0c2ee6e 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -14,15 +14,28 @@
   formula: xtrabackup
   grains:
     noservices: True
+  dependencies:
+    - name: linux
+      repo: git
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/linux.git
+      branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
+    - name: salt
+      repo: git
+      source: https://gerrit.mcp.mirantis.com/salt-formulas/salt.git
+      branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
   state_top:
     base:
       "*":
+        - linux
         - xtrabackup
   pillars:
     top.sls:
       base:
         "*":
           - xtrabackup
+          - repo_percona
+  pillars-from-files:
+    repo_percona.sls: tests/pillar/repo_percona.sls
 
 verifier:
   name: inspec

tests/pillar/repo_percona.sls

diff --git a/tests/pillar/repo_percona.sls b/tests/pillar/repo_percona.sls
new file mode 100644
index 0000000..0272834
--- /dev/null
+++ b/tests/pillar/repo_percona.sls
@@ -0,0 +1,10 @@
+linux:
+  system:
+    enabled: true
+    repo:
+      percona:
+        source: "deb [arch=amd64] http://mirror.mirantis.com/testing/percona/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+        key_url: "http://percona.com/downloads/deb-percona-keyring.gpg"
+      extra:
+        source: "deb http://mirror.mirantis.com/testing/extra/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+        key_url: "http://mirror.mirantis.com/testing/extra/{{ grains.get('oscodename') }}/archive-extra.key"

xtrabackup/map.jinja

diff --git a/xtrabackup/map.jinja b/xtrabackup/map.jinja
index 9eb0de3..e3090fb 100644
--- a/xtrabackup/map.jinja
+++ b/xtrabackup/map.jinja
@@ -1,7 +1,7 @@
 {%- if salt['pillar.get']('xtrabackup:client:qpress:source') == 'pkg' %}
-  {% set client_pkgs_list = ['percona-xtrabackup', 'qpress'] %}
+  {% set client_pkgs_list = ['percona-xtrabackup-24', 'qpress'] %}
 {%- else %}
-  {% set client_pkgs_list = ['percona-xtrabackup' ] %}
+  {% set client_pkgs_list = ['percona-xtrabackup-24' ] %}
 {%- endif %}
 
 {% set client = salt['grains.filter_by']({