From 58bba312112d388865eba6991b43ed87240770f3 Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Wed, 25 Jun 2025 07:34:34 +0200 Subject: [PATCH 1/6] PMM-7: Fix password --- pmm_psmdb_diffauth_setup/test-auth.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pmm_psmdb_diffauth_setup/test-auth.sh b/pmm_psmdb_diffauth_setup/test-auth.sh index 7cca03a..514e5a1 100755 --- a/pmm_psmdb_diffauth_setup/test-auth.sh +++ b/pmm_psmdb_diffauth_setup/test-auth.sh @@ -19,6 +19,10 @@ if [[ -n "$PSMDB_VERSION" ]] && [[ "$PSMDB_VERSION" == *"4.2."* ]]; then export SKIP_AWS_TESTS="true" fi +if [ -z "$admin_password" ]; then + export admin_password=admin +fi + #Generate certificates for tests rm -rf easy-rsa pki certs && mkdir certs git clone https://github.com/OpenVPN/easy-rsa.git @@ -55,7 +59,7 @@ docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server systemctl re set +e i=1 while [ $i -le 3 ]; do - output=$(docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address=pmm-server:8443 --metrics-mode=auto --server-username=admin --server-password=admin --server-insecure-tls) + output=$(docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address=pmm-server:8443 --metrics-mode=auto --server-username=admin --server-password=${admin_password} --server-insecure-tls) exit_code=$? if [ $exit_code -ne 0 ] && [[ $output == *"500 Internal Server Error"* ]]; then From 70ec047ac09d030d3cfb6be9ea584311002eeffa Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Wed, 25 Jun 2025 07:37:35 +0200 Subject: [PATCH 2/6] PMM-7: Fix password --- pmm_psmdb_diffauth_setup/test-auth.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pmm_psmdb_diffauth_setup/test-auth.sh b/pmm_psmdb_diffauth_setup/test-auth.sh index 514e5a1..c603e02 100755 --- a/pmm_psmdb_diffauth_setup/test-auth.sh +++ b/pmm_psmdb_diffauth_setup/test-auth.sh @@ -59,6 +59,7 @@ docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server systemctl re set +e i=1 while [ $i -le 3 ]; do + echo "${admin_password}" output=$(docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address=pmm-server:8443 --metrics-mode=auto --server-username=admin --server-password=${admin_password} --server-insecure-tls) exit_code=$? From 3fcc946c68d2d5434a619ef81437499aef80b337 Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Wed, 25 Jun 2025 07:41:08 +0200 Subject: [PATCH 3/6] PMM-7: Fix password --- pmm_psmdb_diffauth_setup/test-auth.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmm_psmdb_diffauth_setup/test-auth.sh b/pmm_psmdb_diffauth_setup/test-auth.sh index c603e02..a5eef2f 100755 --- a/pmm_psmdb_diffauth_setup/test-auth.sh +++ b/pmm_psmdb_diffauth_setup/test-auth.sh @@ -59,7 +59,7 @@ docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server systemctl re set +e i=1 while [ $i -le 3 ]; do - echo "${admin_password}" + echo "Admin password is: ${admin_password}" output=$(docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address=pmm-server:8443 --metrics-mode=auto --server-username=admin --server-password=${admin_password} --server-insecure-tls) exit_code=$? From 499c8b0c736b181e9318762c6f0971fbed8079ef Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Wed, 25 Jun 2025 07:43:18 +0200 Subject: [PATCH 4/6] PMM-7: Fix password --- pmm_psmdb_diffauth_setup/test-auth.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pmm_psmdb_diffauth_setup/test-auth.sh b/pmm_psmdb_diffauth_setup/test-auth.sh index a5eef2f..ae5fec2 100755 --- a/pmm_psmdb_diffauth_setup/test-auth.sh +++ b/pmm_psmdb_diffauth_setup/test-auth.sh @@ -59,8 +59,8 @@ docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server systemctl re set +e i=1 while [ $i -le 3 ]; do - echo "Admin password is: ${admin_password}" - output=$(docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address=pmm-server:8443 --metrics-mode=auto --server-username=admin --server-password=${admin_password} --server-insecure-tls) + output="Admin password is: ${admin_password}" + docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address=pmm-server:8443 --metrics-mode=auto --server-username=admin --server-password=${admin_password} --server-insecure-tls exit_code=$? if [ $exit_code -ne 0 ] && [[ $output == *"500 Internal Server Error"* ]]; then From 2ad56463d1f53188609b965f1ec907237d13ac57 Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Wed, 25 Jun 2025 07:47:31 +0200 Subject: [PATCH 5/6] PMM-7: Fix password --- pmm_psmdb_diffauth_setup/test-auth.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmm_psmdb_diffauth_setup/test-auth.sh b/pmm_psmdb_diffauth_setup/test-auth.sh index ae5fec2..d84b1d2 100755 --- a/pmm_psmdb_diffauth_setup/test-auth.sh +++ b/pmm_psmdb_diffauth_setup/test-auth.sh @@ -59,7 +59,7 @@ docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server systemctl re set +e i=1 while [ $i -le 3 ]; do - output="Admin password is: ${admin_password}" + output="Admin password is: ${ADMIN_PASSWORD}" docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address=pmm-server:8443 --metrics-mode=auto --server-username=admin --server-password=${admin_password} --server-insecure-tls exit_code=$? From cd81a023514448e1fbd11c245ca90584bbcb3f57 Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Wed, 25 Jun 2025 07:50:55 +0200 Subject: [PATCH 6/6] PMM-7: Fix password --- pmm_psmdb_diffauth_setup/test-auth.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pmm_psmdb_diffauth_setup/test-auth.sh b/pmm_psmdb_diffauth_setup/test-auth.sh index d84b1d2..8d4615d 100755 --- a/pmm_psmdb_diffauth_setup/test-auth.sh +++ b/pmm_psmdb_diffauth_setup/test-auth.sh @@ -19,8 +19,8 @@ if [[ -n "$PSMDB_VERSION" ]] && [[ "$PSMDB_VERSION" == *"4.2."* ]]; then export SKIP_AWS_TESTS="true" fi -if [ -z "$admin_password" ]; then - export admin_password=admin +if [ -z "$ADMIN_PASSWORD" ]; then + export ADMIN_PASSWORD=admin fi #Generate certificates for tests @@ -59,8 +59,7 @@ docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server systemctl re set +e i=1 while [ $i -le 3 ]; do - output="Admin password is: ${ADMIN_PASSWORD}" - docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address=pmm-server:8443 --metrics-mode=auto --server-username=admin --server-password=${admin_password} --server-insecure-tls + output=$(docker compose -f docker-compose-pmm-psmdb.yml exec -T psmdb-server pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address=pmm-server:8443 --metrics-mode=auto --server-username=admin --server-password=${ADMIN_PASSWORD} --server-insecure-tls) exit_code=$? if [ $exit_code -ne 0 ] && [[ $output == *"500 Internal Server Error"* ]]; then