From 229b8d057d23ae75f34068c6764dcfb8a73ef366 Mon Sep 17 00:00:00 2001
From: Vasyl Yurkovych <59879559+yurkovychv@users.noreply.github.com>
Date: Thu, 22 Aug 2024 14:20:36 +0300
Subject: [PATCH] PMM-7 update client repo in gh actions (#721)

---
 .github/workflows/runner-e2e-upgrade-tests.yml |  4 ++--
 pmm-tests/pmm2-client-setup-centos.sh          | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/runner-e2e-upgrade-tests.yml b/.github/workflows/runner-e2e-upgrade-tests.yml
index b50819f5..70179b87 100644
--- a/.github/workflows/runner-e2e-upgrade-tests.yml
+++ b/.github/workflows/runner-e2e-upgrade-tests.yml
@@ -350,7 +350,7 @@ jobs:
           docker exec pmm-integration-server yum update -y percona-release || true
           if [[ "${{ inputs.repository }}" != "release" ]]; then
             docker exec pmm-integration-server sed -i'' -e 's^/release/^/${{ steps.target_repo.outputs.result }}/^' /etc/yum.repos.d/pmm2-server.repo
-            docker exec pmm-integration-server percona-release enable-only original ${{ steps.target_repo.outputs.result }}
+            docker exec pmm-integration-server percona-release enable-only pmm2-client ${{ steps.target_repo.outputs.result }}
           fi
           docker exec pmm-integration-server yum clean all
           
@@ -407,7 +407,7 @@ jobs:
       - name: 'Upgrade <PMM Client> to the latest on "${{ steps.target_repo.outputs.result }}" repo'
         if: ${{ inputs.pmm_client_upgrade_version == '' }}
         run: |
-          sudo percona-release enable-only original ${{ steps.target_repo.outputs.result }}
+          sudo percona-release enable-only pmm2-client ${{ steps.target_repo.outputs.result }}
           sudo apt-get update -y
           sudo apt -y install pmm2-client
           
diff --git a/pmm-tests/pmm2-client-setup-centos.sh b/pmm-tests/pmm2-client-setup-centos.sh
index d34059be..33d1b597 100644
--- a/pmm-tests/pmm2-client-setup-centos.sh
+++ b/pmm-tests/pmm2-client-setup-centos.sh
@@ -44,13 +44,13 @@ export PMM_AGENT_SETUP_NODE_NAME=client_container_$(echo $((1 + $RANDOM % 9999))
 mv -v /artifacts/* .
 
 if [[ "$client_version" == "dev-latest" ]]; then
-    percona-release enable-only original experimental
+    percona-release enable-only pmm2-client experimental
     yum update -y
     yum install -y pmm2-client
 fi
 
 if [[ "$client_version" == "pmm2-rc" ]]; then
-    percona-release enable-only original testing
+    percona-release enable-only pmm2-client testing
     yum update -y
     yum install -y pmm2-client
 fi
@@ -58,12 +58,12 @@ fi
 if [[ "$client_version" == "pmm2-latest" ]]; then
     yum install -y pmm2-client
     yum update -y
-    percona-release enable-only original experimental
+    percona-release enable-only pmm2-client experimental
 fi
 
 if [[ "$client_version" == 2* ]]; then
     yum install -y https://repo.percona.com/pmm2-client/yum/release/2/RPMS/x86_64/pmm2-client-${client_version}-6.el7.x86_64.rpm
-    percona-release enable-only original experimental
+    percona-release enable-only pmm2-client experimental
 fi
 
 if [[ "$client_version" == http* ]]; then
@@ -102,7 +102,7 @@ else
 	else
 	    echo "install pmm-agent 4"
         pmm-agent setup --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml --server-address=${pmm_server_ip}:443 --server-insecure-tls --server-username=admin --server-password=${admin_password}
-    fi    
+    fi
     sleep 10
   echo "install config-file"
 	pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml > pmm-agent.log 2>&1 &