From b3da7f35598d8ca62f0ab8e337f234cc7c4a527a Mon Sep 17 00:00:00 2001 From: Vasyl Yurkovych <59879559+yurkovychv@users.noreply.github.com> Date: Mon, 21 Oct 2024 12:31:37 +0300 Subject: [PATCH 1/4] PMM-7 psmdb 8.0 test --- pmm-tests/pmm-framework.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmm-tests/pmm-framework.sh b/pmm-tests/pmm-framework.sh index 2cc4590b..46a195cb 100755 --- a/pmm-tests/pmm-framework.sh +++ b/pmm-tests/pmm-framework.sh @@ -3060,7 +3060,7 @@ setup_mongo_replica_for_backup() { fi mkdir /tmp/backup_data && chmod 777 /tmp/backup_data pushd qa-integration/pmm_psmdb-pbm_setup - PSMDB_VERSION=$(wget -q --post-data "version=percona-server-mongodb-${mo_version}" https://www.percona.com/products-api.php -O - | grep -oP "(?<=value\=\")[^\"]*" | sort -V | tail -1 | sed -n -e 's/^.*\(mongodb-\)//p') COMPOSE_PROFILES=extra ./start-rs-only.sh + PSMDB_VERSION1=$(wget -q --post-data "version=percona-server-mongodb-${mo_version}" https://www.percona.com/products-api.php -O - | grep -oP "(?<=value\=\")[^\"]*" | sort -V | tail -1 | sed -n -e 's/^.*\(mongodb-\)//p') COMPOSE_PROFILES=extra ./start-rs-only.sh popd popd } From fe843b6e72c52fa78d86612800415a0f7d87c0d7 Mon Sep 17 00:00:00 2001 From: Vasyl Yurkovych <59879559+yurkovychv@users.noreply.github.com> Date: Mon, 21 Oct 2024 13:46:21 +0300 Subject: [PATCH 2/4] Update pmm-framework.sh --- pmm-tests/pmm-framework.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmm-tests/pmm-framework.sh b/pmm-tests/pmm-framework.sh index 46a195cb..669cad1d 100755 --- a/pmm-tests/pmm-framework.sh +++ b/pmm-tests/pmm-framework.sh @@ -3056,7 +3056,7 @@ setup_mongo_replica_for_backup() { mkdir -p /tmp/mongodb_backup_replica || : pushd /tmp/mongodb_backup_replica if [ ! -d "qa-integration" ]; then - git clone -b main https://github.com/Percona-Lab/qa-integration + git clone -b PMM-7-psmdb-8-testing https://github.com/Percona-Lab/qa-integration fi mkdir /tmp/backup_data && chmod 777 /tmp/backup_data pushd qa-integration/pmm_psmdb-pbm_setup From 196fc9f9d09abc79d40608fe44a5b14bdee7ccb2 Mon Sep 17 00:00:00 2001 From: Vasyl Yurkovych <59879559+yurkovychv@users.noreply.github.com> Date: Mon, 21 Oct 2024 16:13:36 +0300 Subject: [PATCH 3/4] PMM-7 update PGSS setup for PG 17 --- pmm-tests/pmm-framework.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pmm-tests/pmm-framework.sh b/pmm-tests/pmm-framework.sh index 669cad1d..2454fd6d 100755 --- a/pmm-tests/pmm-framework.sh +++ b/pmm-tests/pmm-framework.sh @@ -2770,6 +2770,12 @@ setup_pmm_pgss_integration () { if echo "$pgsql_version" | grep '15'; then export PGSQL_VERSION=15 fi + if echo "$pgsql_version" | grep '16'; then + export PGSQL_VERSION=16 + fi + if echo "$pgsql_version" | grep '17'; then + export PGSQL_VERSION=17 + fi if [ -z "$CLIENT_VERSION" ] then export CLIENT_VERSION=dev-latest From 3858a87bac6e02755cba609a386edb81a38fb3e3 Mon Sep 17 00:00:00 2001 From: Vasyl Yurkovych <59879559+yurkovychv@users.noreply.github.com> Date: Thu, 14 Nov 2024 11:17:14 +0200 Subject: [PATCH 4/4] Update pmm-framework.sh --- pmm-tests/pmm-framework.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmm-tests/pmm-framework.sh b/pmm-tests/pmm-framework.sh index 2454fd6d..e235f056 100755 --- a/pmm-tests/pmm-framework.sh +++ b/pmm-tests/pmm-framework.sh @@ -3062,7 +3062,7 @@ setup_mongo_replica_for_backup() { mkdir -p /tmp/mongodb_backup_replica || : pushd /tmp/mongodb_backup_replica if [ ! -d "qa-integration" ]; then - git clone -b PMM-7-psmdb-8-testing https://github.com/Percona-Lab/qa-integration + git clone -b main https://github.com/Percona-Lab/qa-integration fi mkdir /tmp/backup_data && chmod 777 /tmp/backup_data pushd qa-integration/pmm_psmdb-pbm_setup