From 2ec43f6547215bdde07aca69eb99a788924f98d8 Mon Sep 17 00:00:00 2001
From: panchal-yash <yash.panchal@percona.com>
Date: Fri, 1 Sep 2023 13:21:12 +0530
Subject: [PATCH] Remove - from the PMM_VERSION variable and create a new
 Variable PMM_VERSION_SCRIPT

---
 .github/workflows/PMM_PS.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/PMM_PS.yaml b/.github/workflows/PMM_PS.yaml
index 83eef5e..91246ec 100644
--- a/.github/workflows/PMM_PS.yaml
+++ b/.github/workflows/PMM_PS.yaml
@@ -14,6 +14,7 @@ on:
   push:
     branches:
       - main
+      - add-pmm-ps-pxc-ms-workflow
 
   pull_request:
     branches:
@@ -38,12 +39,12 @@ jobs:
         else
           wget https://raw.githubusercontent.com/Percona-QA/package-testing/master/VERSIONS
           PS_VERSION="$(grep 'PS80_VER' VERSIONS | cut -d = -f 2)"
-          PS_VERSION_PATH=$(echo "ps-release-$PS_VERSION")
+          PS_VERSION_PATH=$(echo "ps-$PS_VERSION")
           PS_VERSION_SCRIPT=$(echo ${PS_VERSION%-*})
         fi
         echo "PS_VERSION=${PS_VERSION}" >> $GITHUB_ENV
         echo "PS_VERSION_PATH=${PS_VERSION_PATH}" >> $GITHUB_ENV
-        echo "PS_VERSION_SCRIPT=${PS_VERSION_SCRIPT}" >> $GITHUB_ENV
+        echo "PS_VERSION_SCRIPT=${PS_VERSION_SCRIPT}" | sed 's/"//g' >> $GITHUB_ENV
 
 
     - name: Concatenate values to environment file
@@ -91,7 +92,7 @@ jobs:
       run:  sudo pmm-admin config --server-insecure-tls --server-url=https://admin:admin@localhost:443
 
     - name: Run for PS tests
-      run: ./pmm-framework.sh --ps-version ps-${{ env.PS_VERSION_SCRIPT }} --addclient=ps,1 --pmm2 --ps-tarball ${{ env.PS_TARBALL_PATH }} --query-source=slowlog
+      run: ./pmm-framework.sh --ps-version ${{ env.PS_VERSION_SCRIPT }} --setup-pmm-ps-integration --pmm2 --ps-tarball ${{ env.PS_TARBALL_PATH }} --query-source=slowlog
       working-directory: pmm-qa/pmm-tests
 
     - name: Install Node js