From 4977c798db09eb30d367db2335cdf0591423b2e5 Mon Sep 17 00:00:00 2001
From: panchal-yash <yash.panchal@percona.com>
Date: Mon, 11 Dec 2023 16:58:37 +0530
Subject: [PATCH 1/4] Add PMM PXC ProxySQL2

---
 .github/workflows/PMM_PROXYSQL.yaml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/PMM_PROXYSQL.yaml b/.github/workflows/PMM_PROXYSQL.yaml
index f2be9a7..7bc4eeb 100644
--- a/.github/workflows/PMM_PROXYSQL.yaml
+++ b/.github/workflows/PMM_PROXYSQL.yaml
@@ -1,4 +1,4 @@
-name: PMM_PXC_PROXYSQL
+name: PMM_PROXYSQL
 on:
   workflow_dispatch:
     inputs:
@@ -11,9 +11,14 @@ on:
       pmm_image:
         description: "pmm_image, example: perconalab/pmm-server:dev-latest"
         required: false
+      proxysql_version:
+        required: true
+        description: "proxysql version, example: 2.5.5"
+
   push:
     branches:
       - main
+      - pmm-pxc-proxysql2-packages
 
   pull_request:
     branches:
@@ -21,11 +26,12 @@ on:
 
 jobs:
   PMM_PXC_TEST:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     env:
       PXC_GLIBC: ${{ github.event.inputs.pxc_glibc || '2.35' }}
       PMM_IMAGE: ${{ github.event.inputs.pmm_image || 'perconalab/pmm-server:dev-latest' }}
+      PROXYSQL_VERSION: ${{ github.event.inputs.proxysql_version || '2.5.5' }}
     steps:
     - uses: actions/checkout@v2
 
@@ -51,6 +57,7 @@ jobs:
         echo "PXC_TARBALL_PATH=https://downloads.percona.com/downloads/TESTING/${{env.PXC_VERSION_PATH}}/Percona-XtraDB-Cluster_${{env.PXC_VERSION_TAR}}_Linux.x86_64.glibc${{env.PXC_GLIBC}}.tar.gz" >> $GITHUB_ENV
         echo "PMM_QA_REPO_URL=https://github.com/percona/pmm-qa/" >> $GITHUB_ENV
         echo "PMM_QA_REPO_BRANCH=main" >> $GITHUB_ENV
+        echo "PROXYSQL_PACKAGE_PATH=https://downloads.percona.com/downloads/proxysql2/proxysql2-${{env.PROXYSQL_VERSION}}/binary/debian/jammy/x86_64/proxysql2_${{env.PROXYSQL_VERSION}}-1.1.jammy_amd64.deb" >> $GITHUB_ENV
 
     - name: Install Ansible and update the node
       run: sudo apt-get update -y && sudo apt-get install ansible -y
@@ -83,8 +90,8 @@ jobs:
     - name: setup pmm-admin config
       run:  sudo pmm-admin config --server-insecure-tls --server-url=https://admin:admin@localhost:443
 
-    - name: Run for PXC tests
-      run: ./pmm-framework.sh --with-proxysql --pxc-version ${{ env.PXC_VERSION }} --addclient=pxc,1 --pmm2 --pxc-tarball ${{ env.PXC_TARBALL_PATH }}
+    - name: Run PXC package tests with ProxySQL
+      run: ./pmm-framework.sh --pxc-version ${{ env.PXC_VERSION }} --addclient=pxc,1 --pmm2 --pxc-tarball ${{ env.PXC_TARBALL_PATH }} --proxysql-version="${{ env.PROXYSQL_VERSION }}" --proxysql-package="${{ env.PROXYSQL_PACKAGE_PATH }}"
       working-directory: pmm-qa/pmm-tests
         
     - name: Checkout the repo and install node packages
@@ -96,4 +103,3 @@ jobs:
     - name: Run the Integration tests of PXC
       run: npx codeceptjs run -c pr.codecept.js tests/qa-integration/pmm_pxc_integration_test.js --steps --debug
       working-directory: pmm-ui-tests
-

From a1249660df55a08da6120146c3f8348a4c00a150 Mon Sep 17 00:00:00 2001
From: Yash Panchal <46398416+panchal-yash@users.noreply.github.com>
Date: Fri, 15 Dec 2023 17:49:46 +0530
Subject: [PATCH 2/4] Update PMM_PROXYSQL.yaml for main branch only

---
 .github/workflows/PMM_PROXYSQL.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/PMM_PROXYSQL.yaml b/.github/workflows/PMM_PROXYSQL.yaml
index 7bc4eeb..05fd9e7 100644
--- a/.github/workflows/PMM_PROXYSQL.yaml
+++ b/.github/workflows/PMM_PROXYSQL.yaml
@@ -18,7 +18,6 @@ on:
   push:
     branches:
       - main
-      - pmm-pxc-proxysql2-packages
 
   pull_request:
     branches:

From 0375f03aba90f08c2ab3a04847f8de311dd8916f Mon Sep 17 00:00:00 2001
From: panchal-yash <yash.panchal@percona.com>
Date: Fri, 15 Dec 2023 19:17:11 +0530
Subject: [PATCH 3/4] Test for the branch

---
 .github/workflows/PMM_PROXYSQL.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/PMM_PROXYSQL.yaml b/.github/workflows/PMM_PROXYSQL.yaml
index 05fd9e7..77c93da 100644
--- a/.github/workflows/PMM_PROXYSQL.yaml
+++ b/.github/workflows/PMM_PROXYSQL.yaml
@@ -18,7 +18,8 @@ on:
   push:
     branches:
       - main
-
+      - pmm-pxc-proxysql2-packages
+      
   pull_request:
     branches:
       - main

From 89b9e45516385f48f544e011a7c9db80f5382355 Mon Sep 17 00:00:00 2001
From: Yash Panchal <46398416+panchal-yash@users.noreply.github.com>
Date: Fri, 5 Jan 2024 09:10:33 +0530
Subject: [PATCH 4/4] Update PMM_PROXYSQL.yaml

remove the testing branch from push triggers
---
 .github/workflows/PMM_PROXYSQL.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/PMM_PROXYSQL.yaml b/.github/workflows/PMM_PROXYSQL.yaml
index 77c93da..bda0126 100644
--- a/.github/workflows/PMM_PROXYSQL.yaml
+++ b/.github/workflows/PMM_PROXYSQL.yaml
@@ -18,7 +18,6 @@ on:
   push:
     branches:
       - main
-      - pmm-pxc-proxysql2-packages
       
   pull_request:
     branches: