From 7a9af2a8e5af3624bb44e007d5667ab4bcaf65ed Mon Sep 17 00:00:00 2001
From: Vasyl Yurkovych <59879559+yurkovychv@users.noreply.github.com>
Date: Wed, 13 Dec 2023 17:57:26 +0200
Subject: [PATCH 1/4] PMM-7 fix upgrade to release

---
 vars/setupPMMClient.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vars/setupPMMClient.groovy b/vars/setupPMMClient.groovy
index ec353067bb..6ba428088f 100644
--- a/vars/setupPMMClient.groovy
+++ b/vars/setupPMMClient.groovy
@@ -11,6 +11,7 @@ def call(String SERVER_IP, String CLIENT_VERSION, String PMM_VERSION, String ENA
             export PMM_VERSION=${PMM_VERSION}
             export ENABLE_PULL_MODE=${ENABLE_PULL_MODE}
             export ENABLE_TESTING_REPO=${ENABLE_TESTING_REPO}
+            export ENABLE_EXPERIMENTAL_REPO=${ENABLE_EXPERIMENTAL_REPO}
             export CLIENT_INSTANCE=${CLIENT_INSTANCE}
             export SETUP_TYPE=${SETUP_TYPE}
             export ADMIN_PASSWORD=${ADMIN_PASSWORD}
@@ -45,7 +46,7 @@ def call(String SERVER_IP, String CLIENT_VERSION, String PMM_VERSION, String ENA
                     sudo percona-release enable-only original testing
                 elif [[ "$ENABLE_TESTING_REPO" = no ]]; then
                     sudo percona-release enable-only original experimental
-                else
+                elif [[ "$ENABLE_TESTING_REPO" = no && "$ENABLE_EXPERIMENTAL_REPO" = no  ]]; then
                     sudo percona-release enable-only original release
                 fi
                 sleep 10

From 5e54391a3f4fee21792d7bca4d575ee8f4640cac Mon Sep 17 00:00:00 2001
From: Vasyl Yurkovych <59879559+yurkovychv@users.noreply.github.com>
Date: Wed, 13 Dec 2023 17:58:21 +0200
Subject: [PATCH 2/4] Update pmm2-upgrade-tests.groovy

---
 pmm/pmm2-upgrade-tests.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmm/pmm2-upgrade-tests.groovy b/pmm/pmm2-upgrade-tests.groovy
index 2883e51cc8..fa7d2a5862 100644
--- a/pmm/pmm2-upgrade-tests.groovy
+++ b/pmm/pmm2-upgrade-tests.groovy
@@ -1,4 +1,4 @@
-library changelog: false, identifier: 'lib@master', retriever: modernSCM([
+library changelog: false, identifier: 'lib@PMM-7-fix-upgrade-to-release', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/Percona-Lab/jenkins-pipelines.git'
 ]) _

From 844aff650b1ff2e628265bceb138c3bd484d2229 Mon Sep 17 00:00:00 2001
From: Vasyl Yurkovych <59879559+yurkovychv@users.noreply.github.com>
Date: Thu, 14 Dec 2023 13:35:16 +0200
Subject: [PATCH 3/4] Update setupPMMClient.groovy

---
 vars/setupPMMClient.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vars/setupPMMClient.groovy b/vars/setupPMMClient.groovy
index 6ba428088f..790d6de87d 100644
--- a/vars/setupPMMClient.groovy
+++ b/vars/setupPMMClient.groovy
@@ -1,4 +1,4 @@
-def call(String SERVER_IP, String CLIENT_VERSION, String PMM_VERSION, String ENABLE_PULL_MODE, String ENABLE_TESTING_REPO, String CLIENT_INSTANCE, String SETUP_TYPE, String ADMIN_PASSWORD) {
+def call(String SERVER_IP, String CLIENT_VERSION, String PMM_VERSION, String ENABLE_PULL_MODE, String ENABLE_TESTING_REPO, String CLIENT_INSTANCE, String SETUP_TYPE, String ADMIN_PASSWORD, String ENABLE_EXPERIMENTAL_REPO) {
    withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AMI/OVF', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
         sh '''
             set -o errexit

From 9a4e502f6891fa6cf123626b071e30acaef9503f Mon Sep 17 00:00:00 2001
From: Vasyl Yurkovych <59879559+yurkovychv@users.noreply.github.com>
Date: Thu, 14 Dec 2023 13:36:07 +0200
Subject: [PATCH 4/4] Update pmm2-upgrade-tests.groovy

---
 pmm/pmm2-upgrade-tests.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmm/pmm2-upgrade-tests.groovy b/pmm/pmm2-upgrade-tests.groovy
index fa7d2a5862..70900ec9c5 100644
--- a/pmm/pmm2-upgrade-tests.groovy
+++ b/pmm/pmm2-upgrade-tests.groovy
@@ -264,7 +264,7 @@ pipeline {
                         docker exec pmm-server yum clean all
                         docker exec pmm-server yum clean metadata
                     """
-                    setupPMMClient(env.SERVER_IP, CLIENT_VERSION, 'pmm2', 'no', 'release', 'yes', 'compose_setup', params.ADMIN_PASSWORD)
+                    setupPMMClient(env.SERVER_IP, CLIENT_VERSION, 'pmm2', 'no', 'release', 'yes', 'compose_setup', params.ADMIN_PASSWORD, 'no')
                 }
             }
         }