Skip to content

Pmm3 fix pdpgsql and psmdb versions #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saikumar-vs merged 2 commits into from
Nov 9, 2024
Merged

Pmm3 fix pdpgsql and psmdb versions #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9400485
Fix versions for pdpgsql and psmdb
saikumar-vs Nov 8, 2024
8051af4
Updated Syntax
saikumar-vs Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pmm_qa/pdpgsql_pgsm_setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
become: true
become_method: sudo
vars:
pdpgsql_version: "{{ lookup('vars', 'extra_pdpgsql_version', default=lookup('env','PDPGSQL_VERSION') | default('14', true) ) }}"
pdpgsql_version: "{{ lookup('vars', 'extra_pdpgsql_version', default=lookup('env','PDPGSQL_VERSION') | default('15', true) ) }}"
pdpgsql_pgsm_container: "{{ lookup('vars', 'extra_pdpgsql_pgsm_container', default=lookup('env','PDPGSQL_PGSM_CONTAINER') | default('pdpgsql_pgsm', true) ) }}"
pmm_server_ip: "{{ lookup('vars', 'extra_pmm_server_ip', default=lookup('env','PMM_SERVER_IP') | default('127.0.0.1', true) ) }}"
client_version: "{{ lookup('vars', 'extra_client_version', default=lookup('env','CLIENT_VERSION') | default('dev-latest', true) ) }}"
client_version: "{{ lookup('vars', 'extra_client_version', default=lookup('env','CLIENT_VERSION') | default('3-dev-latest', true) ) }}"
admin_password: "{{ lookup('vars', 'extra_admin_password', default=lookup('env','ADMIN_PASSWORD') | default('admin', true) ) }}"
pmm_qa_branch: "{{ lookup('vars', 'extra_pmm_qa_branch', default=lookup('env','PMM_QA_GIT_BRANCH') | default('main', true) ) }}"
pgstat_monitor_branch: "{{ lookup('vars', 'extra_pgstat_monitor_branch', default=lookup('env','PGSTAT_MONITOR_BRANCH') | default('1.1.1', true) ) }}"
Expand Down
2 changes: 1 addition & 1 deletion pmm_qa/pg_stat_statements_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ done
# If postgres server version is not provided then it will default to version 14.
if [ -z "$pgsql_version" ]
then
export pgsql_version=14
export pgsql_version=15
fi

# If distribution is not provided then it will default to percona distribution 'PPG'
Expand Down
18 changes: 11 additions & 7 deletions pmm_qa/pmm-framework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
# Database configurations
database_configs = {
"PSMDB": {
"versions": ["4.4", "5.0", "6.0", "7.0", "latest"],
"versions": ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"],
"configurations": {"CLIENT_VERSION": "3-dev-latest", "SETUP_TYPE": "pss", "COMPOSE_PROFILES": "classic",
"TARBALL": ""}
},
"SSL_PSMDB": {
"versions": ["4.4", "5.0", "6.0", "7.0", "latest"],
"versions": ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"],
"configurations": {"CLIENT_VERSION": "3-dev-latest", "SETUP_TYPE": "pss", "COMPOSE_PROFILES": "classic",
"TARBALL": ""}
},
Expand All @@ -34,15 +34,15 @@
"TARBALL": ""}
},
"PGSQL": {
"versions": ["11", "12", "13", "14", "15", "16"],
"versions": ["11", "12", "13", "14", "15", "16", "17"],
"configurations": {"QUERY_SOURCE": "pgstatements", "CLIENT_VERSION": "3-dev-latest", "USE_SOCKET": ""}
},
"PDPGSQL": {
"versions": ["11", "12", "13", "14", "15", "16"],
"versions": ["11", "12", "13", "14", "15", "16", "17"],
"configurations": {"CLIENT_VERSION": "3-dev-latest", "USE_SOCKET": ""}
},
"SSL_PDPGSQL": {
"versions": ["11", "12", "13", "14", "15", "16"],
"versions": ["11", "12", "13", "14", "15", "16", "17"],
"configurations": {"CLIENT_VERSION": "3-dev-latest", "USE_SOCKET": ""}
},
"PXC": {
Expand Down Expand Up @@ -492,6 +492,10 @@ def mongo_sharding_setup(script_filename, args):
def get_latest_psmdb_version(psmdb_version):
if psmdb_version == "latest":
return psmdb_version
# workaround till 8.0 is released.
elif psmdb_version in ("8.0", "8.0.1", "8.0.1-1"):
return "8.0.1-1"

# Define the data to be sent in the POST request
data = {
'version': f'percona-server-mongodb-{psmdb_version}'
Expand Down Expand Up @@ -640,7 +644,7 @@ def setup_ssl_psmdb(db_type, db_version=None, db_config=None, args=None):
'PMM_CLIENT_VERSION': get_value('CLIENT_VERSION', db_type, args, db_config),
'COMPOSE_PROFILES': get_value('COMPOSE_PROFILES', db_type, args, db_config),
'MONGO_SETUP_TYPE': get_value('SETUP_TYPE', db_type, args, db_config),
'TESTS': 'no',
'`TESTS`': 'no',
'CLEANUP': 'no'
}

Expand Down Expand Up @@ -752,7 +756,7 @@ def setup_database(db_type, db_version=None, db_config=None, args=None):
for db_type, options in database_configs.items():
db_parser = subparsers.add_parser(db_type.lower())
for config, value in options['configurations'].items():
db_parser.add_argument(f'{config}',metavar='', help=f'{config} for {db_type} (default: {value})')
db_parser.add_argument(f'{config}', metavar='', help=f'{config} for {db_type} (default: {value})')

# Add arguments
parser.add_argument("--database", action='append', nargs=1,
Expand Down
2 changes: 2 additions & 0 deletions pmm_qa/product_version_download_helper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ psmdb # 6.0.2 # https://downloads.percona.com/downloads/percona-distribution-mon

psmdb # 7.0.2 # https://downloads.percona.com/downloads/percona-server-mongodb-7.0/percona-server-mongodb-7.0.2-1/binary/tarball/percona-server-mongodb-7.0.2-1-x86_64.glibc2.17.tar.gz

psmdb # 8.0.1 # https://downloads.percona.com/downloads/TESTING/psmdb-8.0.1/percona-server-mongodb-8.0.1-1-x86_64.jammy-minimal.tar.gz

ps # 8.0.33 # https://downloads.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.33-25/binary/tarball/Percona-Server-8.0.33-25-Linux.x86_64.glibc2.17-minimal.tar.gz

ps # 5.7.43 # https://downloads.percona.com/downloads/Percona-Server-5.7/Percona-Server-5.7.43-47/binary/tarball/Percona-Server-5.7.43-47-Linux.x86_64.glibc2.17-minimal.tar.gz
Expand Down
Loading