Updates fix for merge issues

Percona-Lab · Jan 27, 2025 · 31c4517 · 31c4517
1 parent ad97e5c
commit 31c4517
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pmm_qa/mlaunch_setup.sh b/pmm_qa/mlaunch_setup.sh
@@ -36,7 +36,7 @@ sleep 10
 export SERVICE_RANDOM_NUMBER=$(echo $((1 + $RANDOM % 9999)))
 
 ### Detect latest tarball link for specified mongodb_version: 8.0 | 7.0 | 6.0 | 5.0 | 4.4 | 4.2 at the moment
-psmdb_latest=$(wget -q --post-data "version=percona-server-mongodb-${mongodb_version}" https://www.percona.com/products-api.php -O - | grep  -oP "(?<=value\=\")[^\"]*" | sort -V | tail -1)
+psmdb_latest=$( wget -q --post-data "version=percona-server-mongodb-${mongodb_version}" https://www.percona.com/products-api.php -O - | grep  -oP "(?<=value\=\")[^\"]*" | sort -V | tail -1)
 if [[ "$mongodb_version" == "4.4" ]]; then
    psmdb_tarball=$(wget -q --post-data "version_files=${psmdb_latest}&software_files=binary" https://www.percona.com/products-api.php -O - | jq -r '.[] | select(.link | contains("sha") | not) | .link' | grep glibc2\.17-minimal)
 else

diff --git a/pmm_qa/pmm-framework.py b/pmm_qa/pmm-framework.py
@@ -96,6 +96,7 @@ def run_ansible_playbook(playbook_filename, env_vars, args):
         inventory='127.0.0.1',
         cmdline='-l localhost, --connection=local',
         envvars=env_vars,
+        suppress_env_files=True,
     )
 
     print(f'{playbook_filename} playbook execution {r.status}')
@@ -664,7 +665,7 @@ def setup_ssl_psmdb(db_type, db_version=None, db_config=None, args=None):
         exit(1)
 
     # Gather Version details
-    psmdb_version = os.getenv('PSMDB_VERSION') or get_latest_psmdb_version(db_version) or \
+    psmdb_version = os.getenv('PSMDB_VERSION') or db_version or \
                     database_configs[db_type]["versions"][-1]
 
     # Handle port address for external or internal address
@@ -708,7 +709,7 @@ def setup_ssl_mlaunch(db_type, db_version=None, db_config=None, args=None):
         exit(1)
 
         # Gather Version details
-    psmdb_version = os.getenv('PSMDB_VERSION') or get_latest_psmdb_version(db_version) or \
+    psmdb_version = os.getenv('PSMDB_VERSION') or db_version or \
                     database_configs[db_type]["versions"][-1]
 
     # Define environment variables for playbook