From a2ecd0bcc52d72c3b6351ecea60a71a3795b7383 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Thu, 26 Feb 2026 19:19:08 +0530
Subject: [PATCH 01/29] update

---
 molecule/pdmysql/haproxy/molecule/ubuntu-jammy/molecule.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/molecule/pdmysql/haproxy/molecule/ubuntu-jammy/molecule.yml b/molecule/pdmysql/haproxy/molecule/ubuntu-jammy/molecule.yml
index 0838d4cd8..2d3b40343 100644
--- a/molecule/pdmysql/haproxy/molecule/ubuntu-jammy/molecule.yml
+++ b/molecule/pdmysql/haproxy/molecule/ubuntu-jammy/molecule.yml
@@ -18,8 +18,8 @@ provisioner:
   name: ansible
   log: True
   playbooks:
-    create: ../../../../playbooks/create.yml
-    destroy: ../../../../playbooks/destroy.yml
+    create: ../../../../playbooks/create_noble.yml
+    destroy: ../../../../playbooks/destroy-noble-arm.yml
     prepare: ../../../../playbooks/prepare.yml
     converge: ../../playbooks/playbook.yml
 verifier:

From f42b00cb40d448fc3061404cbecbcab1f498a764 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 11:54:40 +0530
Subject: [PATCH 02/29] update

---
 .../molecule/debian-13/molecule.yml           | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 molecule/proxysql-tarball/molecule/debian-13/molecule.yml

diff --git a/molecule/proxysql-tarball/molecule/debian-13/molecule.yml b/molecule/proxysql-tarball/molecule/debian-13/molecule.yml
new file mode 100644
index 000000000..c7439bbb0
--- /dev/null
+++ b/molecule/proxysql-tarball/molecule/debian-13/molecule.yml
@@ -0,0 +1,48 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: debian13-${BUILD_NUMBER}-${BUILD_NUMBER}-${JOB_NAME}-proxysql-tarball
+    region: us-west-1
+    image: ami-0157ed312f9c59a91
+    vpc_subnet_id: subnet-04a8ad1b1d4da874c
+    instance_type: t2.large
+    ssh_user: admin
+    root_device_name: /dev/xvda
+    instance_tags:
+      iit-billing-tag: proxysql-binary-tarball
+      job-name: ${JOB_NAME}
+provisioner:
+  name: ansible
+  log: True
+  playbooks:
+    create: ../../playbooks/create.yml
+    destroy: ../../playbooks/destroy.yml
+    prepare: ../../playbooks/prepare.yml
+    cleanup: ../../playbooks/cleanup.yml
+    converge: ../../playbooks/playbook.yml
+scenario:
+  name: debian-13
+  destroy_sequence:
+    - destroy
+  clenup_sequence:
+    - cleanup
+  test_sequence:
+    - destroy
+    - create
+    - prepare
+    - converge
+    - verify
+    - cleanup
+    - destroy
+
+verifier:
+  name: testinfra
+  directory: ../../tests/
+  options:
+    verbose: true
+    s: true
+  env:
+    MOLECULE_INVENTORY_FILE: ${MOLECULE_INVENTORY_FILE}

From ee86521b0b2bcff25292f5ec57e74ffd49112cc5 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 12:00:19 +0530
Subject: [PATCH 03/29] update

---
 molecule/proxysql-tarball/molecule/debian-11/molecule.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/molecule/proxysql-tarball/molecule/debian-11/molecule.yml b/molecule/proxysql-tarball/molecule/debian-11/molecule.yml
index 4bd7f8298..c0f4fad5e 100644
--- a/molecule/proxysql-tarball/molecule/debian-11/molecule.yml
+++ b/molecule/proxysql-tarball/molecule/debian-11/molecule.yml
@@ -6,7 +6,7 @@ driver:
 platforms:
   - name: debian11-${BUILD_NUMBER}-${JOB_NAME}-proxysql-tarball
     region: us-west-1
-    image: ami-09b4378b1d3387f81
+    image: ami-02dda1c84e46dbe0a
     vpc_subnet_id: subnet-04a8ad1b1d4da874c
     instance_type: t2.large
     ssh_user: admin
@@ -37,7 +37,7 @@ scenario:
     - verify
     - cleanup
     - destroy
-    
+
 verifier:
   name: testinfra
   directory: ../../tests/
@@ -45,4 +45,4 @@ verifier:
     verbose: true
     s: true
   env:
-    MOLECULE_INVENTORY_FILE: ${MOLECULE_INVENTORY_FILE}
\ No newline at end of file
+    MOLECULE_INVENTORY_FILE: ${MOLECULE_INVENTORY_FILE}

From b03f6e53f2598320bcdda4cf7c831f0030c3a390 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 12:04:09 +0530
Subject: [PATCH 04/29] update

---
 molecule/proxysql-tarball/molecule/oracle-9/molecule.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/molecule/proxysql-tarball/molecule/oracle-9/molecule.yml b/molecule/proxysql-tarball/molecule/oracle-9/molecule.yml
index 34b983972..aefbba395 100644
--- a/molecule/proxysql-tarball/molecule/oracle-9/molecule.yml
+++ b/molecule/proxysql-tarball/molecule/oracle-9/molecule.yml
@@ -6,7 +6,7 @@ driver:
 platforms:
   - name: ol9-${BUILD_NUMBER}-${BUILD_NUMBER}-${JOB_NAME}-proxysql-tarball
     region: us-west-1
-    image: ami-0d1958c85fb6a7b3e
+    image: ami-0fa0ed170a59f4917
     vpc_subnet_id: subnet-04a8ad1b1d4da874c
     instance_type: t2.large
     ssh_user: ec2-user

From 533c8cc8a9cf1d5b270bd1e579641c30062d9076 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 12:06:02 +0530
Subject: [PATCH 05/29] update

---
 .../molecule/al-2023/molecule.yml             | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 molecule/proxysql-tarball/molecule/al-2023/molecule.yml

diff --git a/molecule/proxysql-tarball/molecule/al-2023/molecule.yml b/molecule/proxysql-tarball/molecule/al-2023/molecule.yml
new file mode 100644
index 000000000..1cb438e5a
--- /dev/null
+++ b/molecule/proxysql-tarball/molecule/al-2023/molecule.yml
@@ -0,0 +1,48 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: al2023-${BUILD_NUMBER}-${BUILD_NUMBER}-${JOB_NAME}-proxysql-tarball
+    region: us-west-1
+    image: ami-061ad72bc140532fd
+    vpc_subnet_id: subnet-04a8ad1b1d4da874c
+    instance_type: t2.large
+    ssh_user: ec2-user
+    root_device_name: /dev/xvda
+    instance_tags:
+      iit-billing-tag: proxysql-binary-tarball
+      job-name: ${JOB_NAME}
+provisioner:
+  name: ansible
+  log: True
+  playbooks:
+    create: ../../playbooks/create.yml
+    destroy: ../../playbooks/destroy.yml
+    prepare: ../../playbooks/prepare.yml
+    cleanup: ../../playbooks/cleanup.yml
+    converge: ../../playbooks/playbook.yml
+scenario:
+  name: al-2023
+  destroy_sequence:
+    - destroy
+  clenup_sequence:
+    - cleanup
+  test_sequence:
+    - destroy
+    - create
+    - prepare
+    - converge
+    - verify
+    - cleanup
+    - destroy
+
+verifier:
+  name: testinfra
+  directory: ../../tests/
+  options:
+    verbose: true
+    s: true
+  env:
+    MOLECULE_INVENTORY_FILE: ${MOLECULE_INVENTORY_FILE}

From 296fd8088d4234503dc2c3429be5d2947435de51 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 12:26:19 +0530
Subject: [PATCH 06/29] update

---
 binary-tarball-tests/proxysql/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/binary-tarball-tests/proxysql/run.sh b/binary-tarball-tests/proxysql/run.sh
index 57f69d927..58d2cfe52 100644
--- a/binary-tarball-tests/proxysql/run.sh
+++ b/binary-tarball-tests/proxysql/run.sh
@@ -59,7 +59,7 @@ else
     sudo apt-get install -y percona-xtrabackup-24
   fi
 fi
-if [[ $(lsb_release -sc) == 'bookworm' || $(lsb_release -sc) == 'noble' ]]; then
+if [[ $(lsb_release -sc) == 'bookworm' || $(lsb_release -sc) == 'noble' || $(lsb_release -sc) == 'trixie' ]]; then
   pip3 install --user --break-system-packages pytest-testinfra pytest
 else
   pip3 install --user pytest-testinfra pytest

From 6e9f4df29d28ad54799f0b40372a4bff308342bd Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 12:36:28 +0530
Subject: [PATCH 07/29] update

---
 molecule/proxysql-tarball/tasks/main.yml | 58 ++++++++++++------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/molecule/proxysql-tarball/tasks/main.yml b/molecule/proxysql-tarball/tasks/main.yml
index 550a0f37e..591545cad 100644
--- a/molecule/proxysql-tarball/tasks/main.yml
+++ b/molecule/proxysql-tarball/tasks/main.yml
@@ -14,39 +14,41 @@
   until: result is not failed
   when: ansible_os_family == "Debian"
 
-- name: Import MySQL GPG key (2023)
-  ansible.builtin.rpm_key:
-    state: present
-    key: https://repo.mysql.com/RPM-GPG-KEY-mysql-2023
-  when:
-    - ansible_os_family == "RedHat" and ansible_distribution_major_version == "10"
-
-- name: Download MySQL 8.4 Community repo RPM
-  ansible.builtin.get_url:
-    url: https://repo.mysql.com/mysql84-community-release-el9-1.noarch.rpm
-    dest: /tmp/mysql84-community-release-el9-1.noarch.rpm
-  when:
-    - ansible_os_family == "RedHat" and ansible_distribution_major_version == "10"
-
-- name: Install MySQL repo RPM
-  ansible.builtin.yum:
-    name: /tmp/mysql84-community-release-el9-1.noarch.rpm
-    state: present
-  when:
-    - ansible_os_family == "RedHat" and ansible_distribution_major_version == "10"
-
-- name: Install MySQL 8.4 Community Server
-  ansible.builtin.yum:
-    name: mysql-community-server
-    state: present
-  when:
-    - ansible_os_family == "RedHat" and ansible_distribution_major_version == "10"
+#- name: Import MySQL GPG key (2023)
+#  ansible.builtin.rpm_key:
+#    state: present
+#    key: https://repo.mysql.com/RPM-GPG-KEY-mysql-2023
+#  when:
+#    - ansible_os_family == "RedHat" and ansible_distribution_major_version == "10"
+
+#- name: Download MySQL 8.4 Community repo RPM
+#  ansible.builtin.get_url:
+#    url: https://repo.mysql.com/mysql84-community-release-el9-1.noarch.rpm
+#    dest: /tmp/mysql84-community-release-el9-1.noarch.rpm
+#  when:
+#    - ansible_os_family == "RedHat" and ansible_distribution_major_version == "10"
+
+#- name: Install MySQL repo RPM
+#  ansible.builtin.yum:
+#    name: /tmp/mysql84-community-release-el9-1.noarch.rpm
+#    state: present
+#  when:
+#    - ansible_os_family == "RedHat" and ansible_distribution_major_version == "10"
+
+#- name: Install MySQL 8.4 Community Server
+#  ansible.builtin.yum:
+#    name: mysql-community-server
+#    state: present
+#  when:
+#    - ansible_os_family == "RedHat" and ansible_distribution_major_version == "10"
 
 - name: install needed packages for running tests with yum
   yum:
     name: [git, unzip, wget, tar, numactl, gawk, python3, python3-pip, libev, socat, lsof, mysql]
     state: latest
-  when: ansible_os_family == "RedHat"
+  when:
+    - ansible_os_family == "RedHat"
+    - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "2023")
 
 - name: Install required packages using dnf
   dnf:

From 2a5dfb72774763bdd0cc6ee2c92512c94bd774cc Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 12:40:41 +0530
Subject: [PATCH 08/29] update

---
 VERSIONS                                              | 2 +-
 molecule/proxysql/molecule/debian-11-arm/molecule.yml | 2 +-
 molecule/proxysql/molecule/debian-11/molecule.yml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSIONS b/VERSIONS
index aec066ef9..31aa0f564 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -57,7 +57,7 @@ PXC80_REV="f4ae3e8"
 PXC80_WSREP="4.24(c71acc5)"
 PROXYSQL_VER="1.4.16-percona-1.1"
 PROXYSQL2_VER="2.7.3-percona-1.2"
-PROXYSQL3_VER="3.0.1-percona-1.1"
+PROXYSQL3_VER="3.0.6-percona-1.1"
 PMP_VER="1.1.7"
 SYSBENCH_VER="1.0.20"
 PBM_VER="1.0.0"
diff --git a/molecule/proxysql/molecule/debian-11-arm/molecule.yml b/molecule/proxysql/molecule/debian-11-arm/molecule.yml
index 0fe0755c5..dabe3b173 100644
--- a/molecule/proxysql/molecule/debian-11-arm/molecule.yml
+++ b/molecule/proxysql/molecule/debian-11-arm/molecule.yml
@@ -6,7 +6,7 @@ driver:
 platforms:
   - name: debian11arm-${BUILD_NUMBER}-${JOB_NAME}-${PLAYBOOK_VAR}
     region: us-west-2
-    image: ami-0058eefa46a15f8d5
+    image: ami-0a4fc89e459b5c142
     vpc_subnet_id: subnet-03136d8c244f56036
     instance_type: c6g.large
     ssh_user: admin
diff --git a/molecule/proxysql/molecule/debian-11/molecule.yml b/molecule/proxysql/molecule/debian-11/molecule.yml
index c105bb014..78121538e 100644
--- a/molecule/proxysql/molecule/debian-11/molecule.yml
+++ b/molecule/proxysql/molecule/debian-11/molecule.yml
@@ -6,7 +6,7 @@ driver:
 platforms:
   - name: debian11-${BUILD_NUMBER}-${JOB_NAME}-${PLAYBOOK_VAR}
     region: us-west-2
-    image: ami-0d0f7602aa5c2425d
+    image: ami01ce1f232a5e4adc2
     vpc_subnet_id: subnet-03136d8c244f56036
     instance_type: t2.micro
     ssh_user: admin

From 16eba16e1e211a787a79535ca0643a351410ff7d Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 12:43:00 +0530
Subject: [PATCH 09/29] update

---
 tasks/test_prep.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasks/test_prep.yml b/tasks/test_prep.yml
index e57f955a2..1faa576e0 100644
--- a/tasks/test_prep.yml
+++ b/tasks/test_prep.yml
@@ -250,10 +250,10 @@
     with_items:
     - rm -rf /package-testing
     - rm -f master.zip
-    - wget --no-check-certificate -O master.zip "https://github.com/{{ git_account }}/package-testing/archive/{{ branch }}.zip"
+    - wget --no-check-certificate -O master.zip "https://github.com/kaushikpuneet07/package-testing/archive/proxy-f.zip"
     - unzip master.zip
     - rm -f master.zip
-    - mv "package-testing-{{ branch }}" /package-testing
+    - mv "package-testing-proxy-f" /package-testing
     vars:
       branch: "{{ lookup('env', 'TESTING_BRANCH') | default('master', true) }}"
       git_account: "{{ lookup('env', 'TESTING_GIT_ACCOUNT') | default('Percona-QA', true) }}"

From 6d7d8bf24602660b64804401d07c1c6ed2ba80c1 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 12:48:40 +0530
Subject: [PATCH 10/29] update

---
 molecule/proxysql-tarball/tasks/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/molecule/proxysql-tarball/tasks/main.yml b/molecule/proxysql-tarball/tasks/main.yml
index 591545cad..1e75e2f46 100644
--- a/molecule/proxysql-tarball/tasks/main.yml
+++ b/molecule/proxysql-tarball/tasks/main.yml
@@ -49,6 +49,7 @@
   when:
     - ansible_os_family == "RedHat"
     - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "2023")
+    - not (ansible_distribution == "RedHat" and ansible_distribution_major_version == "10")
 
 - name: Install required packages using dnf
   dnf:

From e2ce3e7d14fd88e274fbe46e9d550d6d315ad8e0 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 12:50:35 +0530
Subject: [PATCH 11/29] update

---
 molecule/proxysql-tarball/tasks/main.yml | 28 ------------------------
 1 file changed, 28 deletions(-)

diff --git a/molecule/proxysql-tarball/tasks/main.yml b/molecule/proxysql-tarball/tasks/main.yml
index 1e75e2f46..f2d8e2d7f 100644
--- a/molecule/proxysql-tarball/tasks/main.yml
+++ b/molecule/proxysql-tarball/tasks/main.yml
@@ -14,34 +14,6 @@
   until: result is not failed
   when: ansible_os_family == "Debian"
 
-#- name: Import MySQL GPG key (2023)
-#  ansible.builtin.rpm_key:
-#    state: present
-#    key: https://repo.mysql.com/RPM-GPG-KEY-mysql-2023
-#  when:
-#    - ansible_os_family == "RedHat" and ansible_distribution_major_version == "10"
-
-#- name: Download MySQL 8.4 Community repo RPM
-#  ansible.builtin.get_url:
-#    url: https://repo.mysql.com/mysql84-community-release-el9-1.noarch.rpm
-#    dest: /tmp/mysql84-community-release-el9-1.noarch.rpm
-#  when:
-#    - ansible_os_family == "RedHat" and ansible_distribution_major_version == "10"
-
-#- name: Install MySQL repo RPM
-#  ansible.builtin.yum:
-#    name: /tmp/mysql84-community-release-el9-1.noarch.rpm
-#    state: present
-#  when:
-#    - ansible_os_family == "RedHat" and ansible_distribution_major_version == "10"
-
-#- name: Install MySQL 8.4 Community Server
-#  ansible.builtin.yum:
-#    name: mysql-community-server
-#    state: present
-#  when:
-#    - ansible_os_family == "RedHat" and ansible_distribution_major_version == "10"
-
 - name: install needed packages for running tests with yum
   yum:
     name: [git, unzip, wget, tar, numactl, gawk, python3, python3-pip, libev, socat, lsof, mysql]

From d22b9a33a1fd2adafe1d5705ccdf9594bc092628 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 16:03:18 +0530
Subject: [PATCH 12/29] update

---
 .../molecule/al-2023-arm/molecule.yml         | 38 ++++++++++++++++++
 .../proxysql/molecule/al-2023/molecule.yml    | 39 +++++++++++++++++++
 .../molecule/debian-13-arm/molecule.yml       | 39 +++++++++++++++++++
 .../proxysql/molecule/debian-13/molecule.yml  | 39 +++++++++++++++++++
 .../molecule/rhel-10-arm/molecule.yml         | 38 ++++++++++++++++++
 .../proxysql/molecule/rhel-10/molecule.yml    | 39 +++++++++++++++++++
 6 files changed, 232 insertions(+)
 create mode 100644 molecule/proxysql/molecule/al-2023-arm/molecule.yml
 create mode 100644 molecule/proxysql/molecule/al-2023/molecule.yml
 create mode 100644 molecule/proxysql/molecule/debian-13-arm/molecule.yml
 create mode 100644 molecule/proxysql/molecule/debian-13/molecule.yml
 create mode 100644 molecule/proxysql/molecule/rhel-10-arm/molecule.yml
 create mode 100644 molecule/proxysql/molecule/rhel-10/molecule.yml

diff --git a/molecule/proxysql/molecule/al-2023-arm/molecule.yml b/molecule/proxysql/molecule/al-2023-arm/molecule.yml
new file mode 100644
index 000000000..357533887
--- /dev/null
+++ b/molecule/proxysql/molecule/al-2023-arm/molecule.yml
@@ -0,0 +1,38 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: al2023-arm-${BUILD_NUMBER}-${JOB_NAME}-${PLAYBOOK_VAR}
+    region: us-west-2
+    image:  ami-0c7104b910fd5acb5
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: c6g.large
+    ssh_user: ec2-user
+    root_device_name: /dev/xvda
+    instance_tags:
+      iit-billing-tag: proxysql-package-testing
+      job-name: ${JOB_NAME}
+provisioner:
+  name: ansible
+  log: True
+  playbooks:
+    create: ../../playbooks/create.yml
+    destroy: ../../playbooks/destroy.yml
+    prepare: ../../playbooks/prepare.yml
+    cleanup: ../../playbooks/cleanup.yml
+    converge: ../../../../playbooks/${PLAYBOOK_VAR}.yml
+scenario:
+  name: al-2023-arm
+  destroy_sequence:
+    - destroy
+  clenup_sequence:
+    - cleanup
+  test_sequence:
+    - destroy
+    - create
+    - prepare
+    - converge
+    - cleanup
+    - destroy
diff --git a/molecule/proxysql/molecule/al-2023/molecule.yml b/molecule/proxysql/molecule/al-2023/molecule.yml
new file mode 100644
index 000000000..ea8db04c8
--- /dev/null
+++ b/molecule/proxysql/molecule/al-2023/molecule.yml
@@ -0,0 +1,39 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: al2023-${BUILD_NUMBER}-${JOB_NAME}-${PLAYBOOK_VAR}
+    region: us-west-2
+    image: ami-0005ee01bca55ab66
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: t2.medium
+    ssh_user: ec2-user
+    root_device_name: /dev/xvda
+    instance_tags:
+      iit-billing-tag: proxysql-package-testing
+      job-name: ${JOB_NAME}
+provisioner:
+  name: ansible
+  log: True
+  playbooks:
+    create: ../../playbooks/create.yml
+    destroy: ../../playbooks/destroy.yml
+    prepare: ../../playbooks/prepare.yml
+    cleanup: ../../playbooks/cleanup.yml
+    converge: ../../../../playbooks/${PLAYBOOK_VAR}.yml
+scenario:
+  name: al-2023
+  destroy_sequence:
+    - destroy
+  clenup_sequence:
+    - cleanup
+  test_sequence:
+    - destroy
+    - create
+    - prepare
+    - converge
+    - verify
+    - cleanup
+    - destroy
diff --git a/molecule/proxysql/molecule/debian-13-arm/molecule.yml b/molecule/proxysql/molecule/debian-13-arm/molecule.yml
new file mode 100644
index 000000000..aff955d39
--- /dev/null
+++ b/molecule/proxysql/molecule/debian-13-arm/molecule.yml
@@ -0,0 +1,39 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: debian13arm-${BUILD_NUMBER}-${JOB_NAME}-${PLAYBOOK_VAR}
+    region: us-west-2
+    image: ami-00f9bd78b9eb2c2d0
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: c6g.large
+    ssh_user: admin
+    root_device_name: /dev/xvda
+    instance_tags:
+      iit-billing-tag: proxysql-package-testing
+      job-name: ${JOB_NAME}
+provisioner:
+  name: ansible
+  log: True
+  playbooks:
+    create: ../../playbooks/create.yml
+    destroy: ../../playbooks/destroy.yml
+    prepare: ../../playbooks/prepare.yml
+    cleanup: ../../playbooks/cleanup.yml
+    converge: ../../../../playbooks/${PLAYBOOK_VAR}.yml
+scenario:
+  name: debian-13-arm
+  destroy_sequence:
+    - destroy
+  clenup_sequence:
+    - cleanup
+  test_sequence:
+    - destroy
+    - create
+    - prepare
+    - converge
+    - verify
+    - cleanup
+    - destroy
diff --git a/molecule/proxysql/molecule/debian-13/molecule.yml b/molecule/proxysql/molecule/debian-13/molecule.yml
new file mode 100644
index 000000000..7c7f5223b
--- /dev/null
+++ b/molecule/proxysql/molecule/debian-13/molecule.yml
@@ -0,0 +1,39 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: debian13-${BUILD_NUMBER}-${JOB_NAME}-${PLAYBOOK_VAR}
+    region: us-west-2
+    image: ami-081ac37fe26dacc98
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: t2.micro
+    ssh_user: admin
+    root_device_name: /dev/xvda
+    instance_tags:
+      iit-billing-tag: proxysql-package-testing
+      job-name: ${JOB_NAME}
+provisioner:
+  name: ansible
+  log: True
+  playbooks:
+    create: ../../playbooks/create.yml
+    destroy: ../../playbooks/destroy.yml
+    prepare: ../../playbooks/prepare.yml
+    cleanup: ../../playbooks/cleanup.yml
+    converge: ../../../../playbooks/${PLAYBOOK_VAR}.yml
+scenario:
+  name: debian-13
+  destroy_sequence:
+    - destroy
+  clenup_sequence:
+    - cleanup
+  test_sequence:
+    - destroy
+    - create
+    - prepare
+    - converge
+    - verify
+    - cleanup
+    - destroy
diff --git a/molecule/proxysql/molecule/rhel-10-arm/molecule.yml b/molecule/proxysql/molecule/rhel-10-arm/molecule.yml
new file mode 100644
index 000000000..c398ace46
--- /dev/null
+++ b/molecule/proxysql/molecule/rhel-10-arm/molecule.yml
@@ -0,0 +1,38 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: rhel10-arm-${BUILD_NUMBER}-${JOB_NAME}-${PLAYBOOK_VAR}
+    region: us-west-2
+    image:  ami-0ee25ba03b69968c5
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: c6g.large
+    ssh_user: ec2-user
+    root_device_name: /dev/sda1
+    instance_tags:
+      iit-billing-tag: proxysql-package-testing
+      job-name: ${JOB_NAME}
+provisioner:
+  name: ansible
+  log: True
+  playbooks:
+    create: ../../playbooks/create.yml
+    destroy: ../../playbooks/destroy.yml
+    prepare: ../../playbooks/prepare.yml
+    cleanup: ../../playbooks/cleanup.yml
+    converge: ../../../../playbooks/${PLAYBOOK_VAR}.yml
+scenario:
+  name: rhel-10-arm
+  destroy_sequence:
+    - destroy
+  clenup_sequence:
+    - cleanup
+  test_sequence:
+    - destroy
+    - create
+    - prepare
+    - converge
+    - cleanup
+    - destroy
diff --git a/molecule/proxysql/molecule/rhel-10/molecule.yml b/molecule/proxysql/molecule/rhel-10/molecule.yml
new file mode 100644
index 000000000..2eb6eeb51
--- /dev/null
+++ b/molecule/proxysql/molecule/rhel-10/molecule.yml
@@ -0,0 +1,39 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: rhel10-${BUILD_NUMBER}-${JOB_NAME}-${PLAYBOOK_VAR}
+    region: us-west-2
+    image: ami-0987e9d53da324257
+    vpc_subnet_id: subnet-03136d8c244f56036
+    instance_type: t2.medium
+    ssh_user: ec2-user
+    root_device_name: /dev/sda1
+    instance_tags:
+      iit-billing-tag: proxysql-package-testing
+      job-name: ${JOB_NAME}
+provisioner:
+  name: ansible
+  log: True
+  playbooks:
+    create: ../../playbooks/create.yml
+    destroy: ../../playbooks/destroy.yml
+    prepare: ../../playbooks/prepare.yml
+    cleanup: ../../playbooks/cleanup.yml
+    converge: ../../../../playbooks/${PLAYBOOK_VAR}.yml
+scenario:
+  name: rhel-10
+  destroy_sequence:
+    - destroy
+  clenup_sequence:
+    - cleanup
+  test_sequence:
+    - destroy
+    - create
+    - prepare
+    - converge
+    - verify
+    - cleanup
+    - destroy

From 1ce36c943a36fdda878879e14cd758ad8059d538 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 16:07:51 +0530
Subject: [PATCH 13/29] update

---
 playbooks/proxysql3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/proxysql3.yml b/playbooks/proxysql3.yml
index 9d29779f8..b930b663c 100644
--- a/playbooks/proxysql3.yml
+++ b/playbooks/proxysql3.yml
@@ -43,7 +43,7 @@
       state: latest
     vars:
       packages:
-      - proxysql2
+      - proxysql3
     when: ansible_os_family == "RedHat"
 
   - name: start proxysql service

From 6752c2aca41b6cd69b2770c22e36250367e8b503 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 16:35:45 +0530
Subject: [PATCH 14/29] update

---
 tasks/enable_proxysql2_testing.yml | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/tasks/enable_proxysql2_testing.yml b/tasks/enable_proxysql2_testing.yml
index b3bcbfbc4..1dfb95e30 100644
--- a/tasks/enable_proxysql2_testing.yml
+++ b/tasks/enable_proxysql2_testing.yml
@@ -11,22 +11,17 @@
      deb: https://repo.percona.com/apt/percona-release_latest.generic_all.deb
     when: ansible_os_family == "Debian"
 
-  - name: Receive GPG key 1
-    command: "gpg --batch --keyserver keyserver.ubuntu.com --recv-keys {{ percona_key1 }}"
-    environment:
-      GNUPGHOME: "{{ gnupg_home }}"
-    when: ansible_os_family == "RedHat"
-
-  - name: Export GPG key 1
-    command: "gpg --batch --export --armor {{ percona_key1 }}"
-    register: gpg_key1
-    environment:
-      GNUPGHOME: "{{ gnupg_home }}"
-    when: ansible_os_family == "RedHat"
-
-  - name: Save GPG key 1 to file
-    copy:
-      content: "{{ gpg_key1.stdout }}"
+  - name: Ensure gnupg home exists (Amazon Linux)
+    file:
+      path: "{{ gnupg_home }}"
+      state: directory
+      mode: '0700'
+    when:
+      - ansible_os_family == "RedHat"
+
+  - name: Download Percona GPG key from Percona's repo (Amazon Linux)
+    get_url:
+      url: https://repo.percona.com/yum/PERCONA-PACKAGING-KEY
       dest: "{{ percona_key1_file }}"
       mode: '0644'
     when: ansible_os_family == "RedHat"

From f534e9ca0e4013bfa577c0f79dbedf4be92c9d62 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 18:06:06 +0530
Subject: [PATCH 15/29] update

---
 tasks/enable_proxysql2_testing.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tasks/enable_proxysql2_testing.yml b/tasks/enable_proxysql2_testing.yml
index 1dfb95e30..3799188dc 100644
--- a/tasks/enable_proxysql2_testing.yml
+++ b/tasks/enable_proxysql2_testing.yml
@@ -66,4 +66,26 @@
     when: ansible_architecture == "aarch64" or ansible_architecture == "arm64"
 
 
+  - name: Refresh AL2023 package metadata
+    shell: |
+      dnf clean all
+      rm -rf /var/cache/dnf
+      dnf makecache
+    when:
+      - ansible_distribution == "Amazon"
+      - ansible_distribution_major_version == "2023"
+
+  - name: Update OpenSSL on AL2023
+    dnf:
+      name:
+        - openssl
+        - openssl-libs
+        - openssl-fips-provider-latest
+      state: latest
+      update_cache: yes
+    when:
+      - ansible_distribution == "Amazon"
+      - ansible_distribution_major_version == "2023"
+
+
 

From 715c29f7712fd62a95586c253dc02ab987ae933b Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 18:09:28 +0530
Subject: [PATCH 16/29] update

---
 tasks/enable_proxysql2_testing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/enable_proxysql2_testing.yml b/tasks/enable_proxysql2_testing.yml
index 3799188dc..069900eb5 100644
--- a/tasks/enable_proxysql2_testing.yml
+++ b/tasks/enable_proxysql2_testing.yml
@@ -45,7 +45,7 @@
 ## PS 57 EOL 
 
   - name: Enable PS 57 EOL repos
-    include_tasks: enable_ps57_eol_tools_repo.yml
+    include_tasks: enable_ps57_eol_release_repo.yml
     when: lookup('env', 'client_to_test') == "ps57"
 
 #  - name: Mandatory step for PXC 57 EOL (Disable all old repos)

From d79b4123e9d75a51c98d96c7e8ff13443f1cf6a9 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Fri, 3 Apr 2026 18:20:48 +0530
Subject: [PATCH 17/29] update

---
 tasks/enable_proxysql2_testing.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tasks/enable_proxysql2_testing.yml b/tasks/enable_proxysql2_testing.yml
index 069900eb5..53236147f 100644
--- a/tasks/enable_proxysql2_testing.yml
+++ b/tasks/enable_proxysql2_testing.yml
@@ -80,7 +80,6 @@
       name:
         - openssl
         - openssl-libs
-        - openssl-fips-provider-latest
       state: latest
       update_cache: yes
     when:

From a8453e13777ef179684e2acd118da8798e9da85e Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Sat, 4 Apr 2026 22:32:41 +0530
Subject: [PATCH 18/29] update

---
 tasks/enable_proxysql2_testing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/enable_proxysql2_testing.yml b/tasks/enable_proxysql2_testing.yml
index 53236147f..2b236ebd6 100644
--- a/tasks/enable_proxysql2_testing.yml
+++ b/tasks/enable_proxysql2_testing.yml
@@ -38,7 +38,7 @@
 ## PXC 57 EOL 
 
   - name: Enable PXC 57 EOL repos
-    include_tasks: enable_pxc57_eol_proxysql2.yml
+    include_tasks: enable_pxc57_eol_tools_repo.yml
     when: lookup('env', 'client_to_test') == "pxc57"
 
 

From 80b8f7437601b2473e17b28c9de2e9fbf67fe864 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Tue, 7 Apr 2026 00:22:12 +0530
Subject: [PATCH 19/29] update

---
 tasks/enable_pxc57_eol_proxysql2.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tasks/enable_pxc57_eol_proxysql2.yml b/tasks/enable_pxc57_eol_proxysql2.yml
index d6f639d03..422f87ab1 100644
--- a/tasks/enable_pxc57_eol_proxysql2.yml
+++ b/tasks/enable_pxc57_eol_proxysql2.yml
@@ -38,11 +38,17 @@
     when:
       - ansible_os_family == "RedHat"
 
-  - name: Mandatory step for PXC 57 EOL (Disable all old repos)
-    command: percona-release disable all
+#  - name: Mandatory step for PXC 57 EOL (Disable all old repos)
+#    command: percona-release disable all
 
-  - name: Mandatory step for PXC 57 EOL (Enable only pxc-57)
-    command: percona-release setup -y pxc-57 
+#  - name: Mandatory step for PXC 57 EOL (Enable only pxc-57)
+#    command: percona-release setup -y pxc-57 
+
+  - name: clean and update yum cache
+    shell: |
+      yum clean all
+      yum makecache
+    when: ansible_os_family == "RedHat"
 
   - name: update deb cache
     apt:

From ba578bcf49221316127ba41ed00523fb8bfecd27 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Tue, 7 Apr 2026 00:43:29 +0530
Subject: [PATCH 20/29] update

---
 tasks/enable_proxysql2_testing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/enable_proxysql2_testing.yml b/tasks/enable_proxysql2_testing.yml
index 2b236ebd6..53236147f 100644
--- a/tasks/enable_proxysql2_testing.yml
+++ b/tasks/enable_proxysql2_testing.yml
@@ -38,7 +38,7 @@
 ## PXC 57 EOL 
 
   - name: Enable PXC 57 EOL repos
-    include_tasks: enable_pxc57_eol_tools_repo.yml
+    include_tasks: enable_pxc57_eol_proxysql2.yml
     when: lookup('env', 'client_to_test') == "pxc57"
 
 

From 74ae3a8b22e6b45900a266406d96fa090f2bb7ab Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Tue, 7 Apr 2026 00:52:49 +0530
Subject: [PATCH 21/29] update

---
 tasks/enable_pxc57_eol_proxysql2.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tasks/enable_pxc57_eol_proxysql2.yml b/tasks/enable_pxc57_eol_proxysql2.yml
index 422f87ab1..2d2b8ad81 100644
--- a/tasks/enable_pxc57_eol_proxysql2.yml
+++ b/tasks/enable_pxc57_eol_proxysql2.yml
@@ -38,6 +38,21 @@
     when:
       - ansible_os_family == "RedHat"
 
+  - name: Download Percona GPG key
+    ansible.builtin.get_url:
+      url: https://github.com/percona/percona-repositories/raw/main/deb/percona-keyring.gpg
+      dest: /tmp/percona-keyring.gpg
+      mode: '0644'
+    when: ansible_os_family == "Debian"
+
+  - name: Install Percona GPG key
+    ansible.builtin.copy:
+      src: /tmp/percona-keyring.gpg
+      dest: /etc/apt/trusted.gpg.d/percona-keyring.gpg
+      remote_src: yes
+      mode: '0644'
+    when: ansible_os_family == "Debian"
+
 #  - name: Mandatory step for PXC 57 EOL (Disable all old repos)
 #    command: percona-release disable all
 

From a32e9ec4dbd3aecb9b993ae7c097bf0a3456d489 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Tue, 7 Apr 2026 10:53:59 +0530
Subject: [PATCH 22/29] update

---
 molecule/proxysql/molecule/al-2023-arm/molecule.yml | 2 +-
 molecule/proxysql/molecule/al-2023/molecule.yml     | 2 +-
 molecule/proxysql/molecule/debian-11/molecule.yml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/molecule/proxysql/molecule/al-2023-arm/molecule.yml b/molecule/proxysql/molecule/al-2023-arm/molecule.yml
index 357533887..bdd9cf1e7 100644
--- a/molecule/proxysql/molecule/al-2023-arm/molecule.yml
+++ b/molecule/proxysql/molecule/al-2023-arm/molecule.yml
@@ -6,7 +6,7 @@ driver:
 platforms:
   - name: al2023-arm-${BUILD_NUMBER}-${JOB_NAME}-${PLAYBOOK_VAR}
     region: us-west-2
-    image:  ami-0c7104b910fd5acb5
+    image:  ami-00478270b6d87a5d1
     vpc_subnet_id: subnet-03136d8c244f56036
     instance_type: c6g.large
     ssh_user: ec2-user
diff --git a/molecule/proxysql/molecule/al-2023/molecule.yml b/molecule/proxysql/molecule/al-2023/molecule.yml
index ea8db04c8..d4ff239b2 100644
--- a/molecule/proxysql/molecule/al-2023/molecule.yml
+++ b/molecule/proxysql/molecule/al-2023/molecule.yml
@@ -6,7 +6,7 @@ driver:
 platforms:
   - name: al2023-${BUILD_NUMBER}-${JOB_NAME}-${PLAYBOOK_VAR}
     region: us-west-2
-    image: ami-0005ee01bca55ab66
+    image: ami-043ab4148b7bb33e9
     vpc_subnet_id: subnet-03136d8c244f56036
     instance_type: t2.medium
     ssh_user: ec2-user
diff --git a/molecule/proxysql/molecule/debian-11/molecule.yml b/molecule/proxysql/molecule/debian-11/molecule.yml
index 78121538e..aa74cdceb 100644
--- a/molecule/proxysql/molecule/debian-11/molecule.yml
+++ b/molecule/proxysql/molecule/debian-11/molecule.yml
@@ -6,7 +6,7 @@ driver:
 platforms:
   - name: debian11-${BUILD_NUMBER}-${JOB_NAME}-${PLAYBOOK_VAR}
     region: us-west-2
-    image: ami01ce1f232a5e4adc2
+    image: ami-01ce1f232a5e4adc2
     vpc_subnet_id: subnet-03136d8c244f56036
     instance_type: t2.micro
     ssh_user: admin

From 1a61f456dc4fbc3f6914661c00d818d6ffa7e30f Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Tue, 7 Apr 2026 11:18:36 +0530
Subject: [PATCH 23/29] update

---
 playbooks/proxysql3.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/playbooks/proxysql3.yml b/playbooks/proxysql3.yml
index b930b663c..820424e0c 100644
--- a/playbooks/proxysql3.yml
+++ b/playbooks/proxysql3.yml
@@ -48,12 +48,42 @@
 
   - name: start proxysql service
     service: name=proxysql state=started
+    when: ansible_distribution != "Amazon"
 
   - name: stop proxysql service
     service: name=proxysql state=stopped
+    when: ansible_distribution != "Amazon"
 
   - name: start proxysql service
     service: name=proxysql state=started
+    when: ansible_distribution != "Amazon"
+
+  - name: start proxysql service again on non-AL2023
+    service:
+      name: proxysql
+      state: started
+    when: not (
+            ansible_distribution == "Amazon" and
+            ansible_distribution_major_version == "2023"
+          )
+
+  - name: stop proxysql service on non-AL2023
+    service:
+      name: proxysql
+      state: stopped
+    when: not (
+            ansible_distribution == "Amazon" and
+            ansible_distribution_major_version == "2023"
+          )
+
+  - name: start proxysql service again on non-AL2023
+    service:
+      name: proxysql
+      state: started
+    when: not (
+            ansible_distribution == "Amazon" and
+            ansible_distribution_major_version == "2023"
+          )
 
   - name: run client_check tasks
     include_tasks: ../tasks/client_check.yml

From 5976c062384959f742478ee47641f0b1b5e1dd87 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Tue, 7 Apr 2026 11:52:40 +0530
Subject: [PATCH 24/29] update

---
 tasks/enable_proxysql2_main.yml    | 33 +++++++++++-------------------
 tasks/enable_proxysql2_testing.yml | 21 -------------------
 2 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/tasks/enable_proxysql2_main.yml b/tasks/enable_proxysql2_main.yml
index b623c20d5..0d39bd5af 100644
--- a/tasks/enable_proxysql2_main.yml
+++ b/tasks/enable_proxysql2_main.yml
@@ -11,30 +11,21 @@
      deb: https://repo.percona.com/apt/percona-release_latest.generic_all.deb
     when: ansible_os_family == "Debian"
 
-  - name: Receive GPG key 1
-    command: "gpg --batch --keyserver keyserver.ubuntu.com --recv-keys {{ percona_key1 }}"
-    environment:
-      GNUPGHOME: "{{ gnupg_home }}"
-    when: ansible_os_family == "RedHat"
-
-  - name: Export GPG key 1
-    command: "gpg --batch --export --armor {{ percona_key1 }}"
-    register: gpg_key1
-    environment:
-      GNUPGHOME: "{{ gnupg_home }}"
-    when: ansible_os_family == "RedHat"
-
-  - name: Save GPG key 1 to file
-    copy:
-      content: "{{ gpg_key1.stdout }}"
+  - name: Ensure gnupg home exists (Amazon Linux)
+    file:
+      path: "{{ gnupg_home }}"
+      state: directory
+      mode: '0700'
+    when:
+      - ansible_os_family == "RedHat"
+
+  - name: Download Percona GPG key from Percona's repo (Amazon Linux)
+    get_url:
+      url: https://repo.percona.com/yum/PERCONA-PACKAGING-KEY
       dest: "{{ percona_key1_file }}"
       mode: '0644'
     when: ansible_os_family == "RedHat"
 
-  - name: Import GPG keys with rpmkeys
-    command: "rpmkeys --import {{ percona_key1_file }}"
-    when: ansible_os_family == "RedHat"
-
   - name: add the main Percona yum repos for centos
 #   yum: name=https://repo.percona.com/yum/testing/latest/RPMS/noarch/percona-release-1.0-21.noarch.rpm
     yum: name=https://repo.percona.com/yum/percona-release-latest.noarch.rpm
@@ -50,7 +41,7 @@
 ## PS 57 EOL 
 
   - name: Enable PS 57 EOL repos
-    include_tasks: enable_ps57_eol_tools_repo.yml
+    include_tasks: enable_ps57_eol_release_repo.yml
     when: lookup('env', 'client_to_test') == "ps57"
 
 #  - name: Mandatory step for PXC 57 EOL (Disable all old repos)
diff --git a/tasks/enable_proxysql2_testing.yml b/tasks/enable_proxysql2_testing.yml
index 53236147f..b7efe8bab 100644
--- a/tasks/enable_proxysql2_testing.yml
+++ b/tasks/enable_proxysql2_testing.yml
@@ -66,25 +66,4 @@
     when: ansible_architecture == "aarch64" or ansible_architecture == "arm64"
 
 
-  - name: Refresh AL2023 package metadata
-    shell: |
-      dnf clean all
-      rm -rf /var/cache/dnf
-      dnf makecache
-    when:
-      - ansible_distribution == "Amazon"
-      - ansible_distribution_major_version == "2023"
-
-  - name: Update OpenSSL on AL2023
-    dnf:
-      name:
-        - openssl
-        - openssl-libs
-      state: latest
-      update_cache: yes
-    when:
-      - ansible_distribution == "Amazon"
-      - ansible_distribution_major_version == "2023"
-
-
 

From c2c0daf520f7d56c7dc528a190a10066eee1bc14 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Tue, 7 Apr 2026 11:54:08 +0530
Subject: [PATCH 25/29] update

---
 playbooks/proxysql3_upgrade.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/playbooks/proxysql3_upgrade.yml b/playbooks/proxysql3_upgrade.yml
index c13fe09af..ed132d267 100644
--- a/playbooks/proxysql3_upgrade.yml
+++ b/playbooks/proxysql3_upgrade.yml
@@ -45,12 +45,42 @@
 
   - name: start proxysql service
     service: name=proxysql state=started
+    when: ansible_distribution != "Amazon"
 
   - name: stop proxysql service
     service: name=proxysql state=stopped
+    when: ansible_distribution != "Amazon"
 
   - name: start proxysql service
     service: name=proxysql state=started
+    when: ansible_distribution != "Amazon"
+
+  - name: start proxysql service again on non-AL2023
+    service:
+      name: proxysql
+      state: started
+    when: not (
+            ansible_distribution == "Amazon" and
+            ansible_distribution_major_version == "2023"
+          )
+
+  - name: stop proxysql service on non-AL2023
+    service:
+      name: proxysql
+      state: stopped
+    when: not (
+            ansible_distribution == "Amazon" and
+            ansible_distribution_major_version == "2023"
+          )
+
+  - name: start proxysql service again on non-AL2023
+    service:
+      name: proxysql
+      state: started
+    when: not (
+            ansible_distribution == "Amazon" and
+            ansible_distribution_major_version == "2023"
+          )
 
 #
 # Enable testing repository

From d925f3f62de827fdf7a9de222340d32c2af33445 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Tue, 7 Apr 2026 12:18:54 +0530
Subject: [PATCH 26/29] update

---
 tasks/enable_proxysql2_main.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tasks/enable_proxysql2_main.yml b/tasks/enable_proxysql2_main.yml
index 0d39bd5af..13eb14c9e 100644
--- a/tasks/enable_proxysql2_main.yml
+++ b/tasks/enable_proxysql2_main.yml
@@ -26,6 +26,10 @@
       mode: '0644'
     when: ansible_os_family == "RedHat"
 
+  - name: Import GPG keys with rpmkeys
+    command: "rpmkeys --import {{ percona_key1_file }}"
+    when: ansible_os_family == "RedHat"
+
   - name: add the main Percona yum repos for centos
 #   yum: name=https://repo.percona.com/yum/testing/latest/RPMS/noarch/percona-release-1.0-21.noarch.rpm
     yum: name=https://repo.percona.com/yum/percona-release-latest.noarch.rpm

From ae54886bf324c3923875400fe549733dd98b9a3e Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Tue, 7 Apr 2026 13:50:36 +0530
Subject: [PATCH 27/29] update

---
 playbooks/proxysql3_maj_upgrade.yml | 55 ++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/playbooks/proxysql3_maj_upgrade.yml b/playbooks/proxysql3_maj_upgrade.yml
index 177511a20..52ff3ead9 100644
--- a/playbooks/proxysql3_maj_upgrade.yml
+++ b/playbooks/proxysql3_maj_upgrade.yml
@@ -48,12 +48,29 @@
 
   - name: start proxysql service
     service: name=proxysql state=started
+    when: ansible_distribution != "Amazon
 
   - name: stop proxysql service
     service: name=proxysql state=stopped
-
-# - name: start proxysql service
-#   service: name=proxysql state=started
+    when: ansible_distribution != "Amazon
+
+  - name: stop proxysql service on non-AL2023
+    service:
+      name: proxysql
+      state: stopped
+    when: not (
+            ansible_distribution == "Amazon" and
+            ansible_distribution_major_version == "2023"
+          )
+
+  - name: start proxysql service again on non-AL2023
+    service:
+      name: proxysql
+      state: started
+    when: not (
+            ansible_distribution == "Amazon" and
+            ansible_distribution_major_version == "2023"
+          )
 
   - name: install proxysql3 new deb packages
     apt:
@@ -74,17 +91,37 @@
       - proxysql3
     when: ansible_os_family == "RedHat"
 
-  - name: run client_check tasks
-    include_tasks: ../tasks/client_check.yml
-
-  - name: check that proxysql3 version is correct
-    command: /package-testing/version_check.sh proxysql3
-
   - name: start proxysql service
     service: name=proxysql state=started
+    when: ansible_distribution != "Amazon
 
   - name: stop proxysql service
     service: name=proxysql state=stopped
+    when: ansible_distribution != "Amazon
+
+  - name: stop proxysql service on non-AL2023
+    service:
+      name: proxysql
+      state: stopped
+    when: not (
+            ansible_distribution == "Amazon" and
+            ansible_distribution_major_version == "2023"
+          )
+
+  - name: start proxysql service again on non-AL2023
+    service:
+      name: proxysql
+      state: started
+    when: not (
+            ansible_distribution == "Amazon" and
+            ansible_distribution_major_version == "2023"
+          )
+
+  - name: run client_check tasks
+    include_tasks: ../tasks/client_check.yml
+
+  - name: check that proxysql3 version is correct
+    command: /package-testing/version_check.sh proxysql3
 
   - name: start proxysql service
     service: name=proxysql state=started

From bb66d5c04ae42d5a78c35888f877b460926b77e3 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Tue, 7 Apr 2026 14:08:38 +0530
Subject: [PATCH 28/29] update

---
 playbooks/proxysql3_maj_upgrade.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/playbooks/proxysql3_maj_upgrade.yml b/playbooks/proxysql3_maj_upgrade.yml
index 52ff3ead9..da626b81c 100644
--- a/playbooks/proxysql3_maj_upgrade.yml
+++ b/playbooks/proxysql3_maj_upgrade.yml
@@ -48,11 +48,11 @@
 
   - name: start proxysql service
     service: name=proxysql state=started
-    when: ansible_distribution != "Amazon
+    when: ansible_distribution != "Amazon"
 
   - name: stop proxysql service
     service: name=proxysql state=stopped
-    when: ansible_distribution != "Amazon
+    when: ansible_distribution != "Amazon"
 
   - name: stop proxysql service on non-AL2023
     service:
@@ -93,11 +93,11 @@
 
   - name: start proxysql service
     service: name=proxysql state=started
-    when: ansible_distribution != "Amazon
+    when: ansible_distribution != "Amazon"
 
   - name: stop proxysql service
     service: name=proxysql state=stopped
-    when: ansible_distribution != "Amazon
+    when: ansible_distribution != "Amazon"
 
   - name: stop proxysql service on non-AL2023
     service:

From f8455d4ed45e12465928b31031b971668690bc17 Mon Sep 17 00:00:00 2001
From: kaushikpuneet07 <puneet.kaushik@percona.com>
Date: Tue, 7 Apr 2026 14:26:32 +0530
Subject: [PATCH 29/29] update

---
 playbooks/proxysql3_maj_upgrade.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/playbooks/proxysql3_maj_upgrade.yml b/playbooks/proxysql3_maj_upgrade.yml
index da626b81c..3b999106e 100644
--- a/playbooks/proxysql3_maj_upgrade.yml
+++ b/playbooks/proxysql3_maj_upgrade.yml
@@ -83,12 +83,11 @@
     when: ansible_os_family == "Debian"
 
   - name: install proxysql3 new rpm packages
-    yum:
-      name: "{{ packages }}"
+    dnf:
+      name:
+        - proxysql3
       state: latest
-    vars:
-      packages:
-      - proxysql3
+      allowerasing: true
     when: ansible_os_family == "RedHat"
 
   - name: start proxysql service