From fcf7dcd7830234fdb95fd57f94827f74eedf9769 Mon Sep 17 00:00:00 2001
From: Nurlan Moldomurov <nurlan.moldomurov@percona.com>
Date: Fri, 15 Sep 2023 20:29:42 +0300
Subject: [PATCH 1/3] Update docker_way_upgrade.sh

---
 pmm-tests/docker_way_upgrade.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pmm-tests/docker_way_upgrade.sh b/pmm-tests/docker_way_upgrade.sh
index 593c6e99..eecb69b9 100644
--- a/pmm-tests/docker_way_upgrade.sh
+++ b/pmm-tests/docker_way_upgrade.sh
@@ -6,6 +6,16 @@ if [ $# -lt 1 ]; then
     exit 1
 fi
 
+wait-for-url() {
+    echo "Testing $1"
+    timeout -s TERM 120 bash -c \
+    'while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' ${0})" != "200" ]];\
+    do echo "Waiting for ${0}" && sleep 2;\
+    done' ${1}
+    echo "OK!"
+    curl -I $1
+}
+
 #check for Container Name To Stop before Upgrade
 export PMM_SERVER_DOCKER_CONTAINER=$(docker ps --format "table {{.ID}}\t{{.Image}}\t{{.Names}}" | grep 'pmm-server' | awk '{print $3}')
 echo $PMM_SERVER_DOCKER_CONTAINER
@@ -17,5 +27,5 @@ export PMM_SERVER_DOCKER_VOLUME=$(docker ps -a --format "table {{.ID}}\t{{.Image
 
 PWD=$(pwd) PMM_SERVER_IMAGE=$1 docker-compose up -d pmm-server
 docker network connect pmm-qa pmm-server || true
-sleep 30
+wait-for-url http://127.0.0.1/v1/readyz
 docker logs pmm-server

From d1cae8d91fc54084455f7d4fd7356be7189e638b Mon Sep 17 00:00:00 2001
From: Nurlan Moldomurov <nurlan.moldomurov@percona.com>
Date: Fri, 15 Sep 2023 22:54:06 +0300
Subject: [PATCH 2/3] Update docker_way_upgrade.sh

---
 pmm-tests/docker_way_upgrade.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pmm-tests/docker_way_upgrade.sh b/pmm-tests/docker_way_upgrade.sh
index eecb69b9..3c3382da 100644
--- a/pmm-tests/docker_way_upgrade.sh
+++ b/pmm-tests/docker_way_upgrade.sh
@@ -8,12 +8,16 @@ fi
 
 wait-for-url() {
     echo "Testing $1"
-    timeout -s TERM 120 bash -c \
+    timeout -s TERM 240 bash -c \
     'while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' ${0})" != "200" ]];\
     do echo "Waiting for ${0}" && sleep 2;\
     done' ${1}
     echo "OK!"
-    curl -I $1
+    if curl -I $1; then
+        echo "Command succeeded"
+    else
+        echo "Command failed"
+    fi
 }
 
 #check for Container Name To Stop before Upgrade

From 9b2b7e024d827da0487c050e847bbb88f6b072f4 Mon Sep 17 00:00:00 2001
From: Nurlan Moldomurov <nurlan.moldomurov@percona.com>
Date: Fri, 15 Sep 2023 22:54:32 +0300
Subject: [PATCH 3/3] Update docker_way_upgrade.sh

---
 pmm-tests/docker_way_upgrade.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pmm-tests/docker_way_upgrade.sh b/pmm-tests/docker_way_upgrade.sh
index 3c3382da..20230f9d 100644
--- a/pmm-tests/docker_way_upgrade.sh
+++ b/pmm-tests/docker_way_upgrade.sh
@@ -14,9 +14,9 @@ wait-for-url() {
     done' ${1}
     echo "OK!"
     if curl -I $1; then
-        echo "Command succeeded"
+        echo "PMM is ready"
     else
-        echo "Command failed"
+        echo "PMM is not ready"
     fi
 }