From 52fdae9e1aea7f239eeb4b38906832fda3f00a53 Mon Sep 17 00:00:00 2001 From: Saikumar Date: Tue, 4 Mar 2025 14:37:46 +0530 Subject: [PATCH 1/3] Updates, Add support for PMM-13805 --- pmm_qa/pmm-framework.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pmm_qa/pmm-framework.py b/pmm_qa/pmm-framework.py index aaa6190d..1d183ad4 100755 --- a/pmm_qa/pmm-framework.py +++ b/pmm_qa/pmm-framework.py @@ -272,13 +272,14 @@ def setup_pdpgsql(db_type, db_version=None, db_config=None, args=None): print(f"Check if PMM Server is Up and Running..Exiting") exit() - # Gather Version details - pdpgsql_version = os.getenv('PDPGSQL_VERSION') or db_version or database_configs[db_type]["versions"][-1] + # Gather Version details, Note: we accept minor versions and dont validate in Configs. + pdpgsql_version = db_version or database_configs[db_type]["versions"][-1] # Define environment variables for playbook env_vars = { 'PGSTAT_MONITOR_BRANCH': 'main', 'PDPGSQL_VERSION': pdpgsql_version, + 'PPG_REPO_TYPE' 'testing' 'PMM_SERVER_IP': args.pmm_server_ip or container_name or '127.0.0.1', 'PDPGSQL_PGSM_CONTAINER': 'pdpgsql_pgsm_pmm_' + str(pdpgsql_version), 'CLIENT_VERSION': get_value('CLIENT_VERSION', db_type, args, db_config), From e6e10421c8e92b52729f27b2e6c88f11bda2d729 Mon Sep 17 00:00:00 2001 From: Saikumar Date: Tue, 4 Mar 2025 14:51:03 +0530 Subject: [PATCH 2/3] Updates Fix check --- pmm_qa/pmm-framework.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmm_qa/pmm-framework.py b/pmm_qa/pmm-framework.py index 1d183ad4..ccd13222 100755 --- a/pmm_qa/pmm-framework.py +++ b/pmm_qa/pmm-framework.py @@ -273,7 +273,7 @@ def setup_pdpgsql(db_type, db_version=None, db_config=None, args=None): exit() # Gather Version details, Note: we accept minor versions and dont validate in Configs. - pdpgsql_version = db_version or database_configs[db_type]["versions"][-1] + pdpgsql_version = os.getenv('PDPGSQL_VERSION') or database_configs[db_type]["versions"][-1] # Define environment variables for playbook env_vars = { From 74497a93dd786d78a7827abe57873751265a446f Mon Sep 17 00:00:00 2001 From: Saikumar Date: Tue, 4 Mar 2025 15:09:39 +0530 Subject: [PATCH 3/3] Updates fixed lint misses, --- pmm_qa/pmm-framework.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmm_qa/pmm-framework.py b/pmm_qa/pmm-framework.py index ccd13222..77b90e03 100755 --- a/pmm_qa/pmm-framework.py +++ b/pmm_qa/pmm-framework.py @@ -279,7 +279,7 @@ def setup_pdpgsql(db_type, db_version=None, db_config=None, args=None): env_vars = { 'PGSTAT_MONITOR_BRANCH': 'main', 'PDPGSQL_VERSION': pdpgsql_version, - 'PPG_REPO_TYPE' 'testing' + 'PPG_REPO_TYPE': 'testing', 'PMM_SERVER_IP': args.pmm_server_ip or container_name or '127.0.0.1', 'PDPGSQL_PGSM_CONTAINER': 'pdpgsql_pgsm_pmm_' + str(pdpgsql_version), 'CLIENT_VERSION': get_value('CLIENT_VERSION', db_type, args, db_config),