From 56ed99d39d7cd0389d8b08c645d171f883b2f110 Mon Sep 17 00:00:00 2001
From: Vasyl Yurkovych <59879559+yurkovychv@users.noreply.github.com>
Date: Thu, 23 May 2024 10:34:29 +0300
Subject: [PATCH 1/4] PMM-7 upgrade playwright tests runner tweak

---
 .github/workflows/runner-e2e-upgrade-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/runner-e2e-upgrade-tests.yml b/.github/workflows/runner-e2e-upgrade-tests.yml
index b0cdc070..c7adb391 100644
--- a/.github/workflows/runner-e2e-upgrade-tests.yml
+++ b/.github/workflows/runner-e2e-upgrade-tests.yml
@@ -382,7 +382,7 @@ jobs:
             --volumes-from pmm-integration-server-data \
             --name pmm-integration-server \
             ${{ steps.pmm_server_to_image.outputs.IMAGE }}
-          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://${{ env.PMM_SERVER_IP }}/v1/readyz)" != "200" ]]; do sleep 2; done' || false
+          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://${{ env.PMM_SERVER_IP }}/v1/readyz)" != "200" ]]; do echo "waiting for ${{ env.PMM_SERVER_IP }}" && sleep 2; done' || false
 
       - name: 'Upgrade pmm-server: <Podman way>'
         if: ${{ inputs.upgrade_type == 'Podman way' }}
@@ -395,7 +395,7 @@ jobs:
           podman pull docker.io/${{ steps.pmm_server_to_image.outputs.IMAGE }}
           systemctl --user restart pmm-server
 
-          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://${{ env.PMM_SERVER_IP }}/v1/readyz)" != "200" ]]; do sleep 2; done' || false
+          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://${{ env.PMM_SERVER_IP }}/v1/readyz)" != "200" ]]; do echo "waiting for ${{ env.PMM_SERVER_IP }}" && sleep 2; done' || false
 
       - name: 'Tests <before PMM Client> upgrade'
         working-directory: ./pmm-ui-tests/playwright-tests

From dfc5986d479d9ac660da285f03e7bcc48676e11d Mon Sep 17 00:00:00 2001
From: Vasyl Yurkovych <59879559+yurkovychv@users.noreply.github.com>
Date: Thu, 23 May 2024 10:50:31 +0300
Subject: [PATCH 2/4] Update runner-e2e-upgrade-tests.yml

---
 .github/workflows/runner-e2e-upgrade-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/runner-e2e-upgrade-tests.yml b/.github/workflows/runner-e2e-upgrade-tests.yml
index c7adb391..86b5e48a 100644
--- a/.github/workflows/runner-e2e-upgrade-tests.yml
+++ b/.github/workflows/runner-e2e-upgrade-tests.yml
@@ -382,7 +382,7 @@ jobs:
             --volumes-from pmm-integration-server-data \
             --name pmm-integration-server \
             ${{ steps.pmm_server_to_image.outputs.IMAGE }}
-          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://${{ env.PMM_SERVER_IP }}/v1/readyz)" != "200" ]]; do echo "waiting for ${{ env.PMM_SERVER_IP }}" && sleep 2; done' || false
+          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://${{ env.PMM_SERVER_IP }}/v1/version)" != "200" ]]; do echo "waiting for ${{ env.PMM_SERVER_IP }}" && sleep 2; done' || false
 
       - name: 'Upgrade pmm-server: <Podman way>'
         if: ${{ inputs.upgrade_type == 'Podman way' }}
@@ -395,7 +395,7 @@ jobs:
           podman pull docker.io/${{ steps.pmm_server_to_image.outputs.IMAGE }}
           systemctl --user restart pmm-server
 
-          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://${{ env.PMM_SERVER_IP }}/v1/readyz)" != "200" ]]; do echo "waiting for ${{ env.PMM_SERVER_IP }}" && sleep 2; done' || false
+          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://${{ env.PMM_SERVER_IP }}/v1/version)" != "200" ]]; do echo "waiting for ${{ env.PMM_SERVER_IP }}" && sleep 2; done' || false
 
       - name: 'Tests <before PMM Client> upgrade'
         working-directory: ./pmm-ui-tests/playwright-tests

From 7e8bd3c93dbcdf8a57e2bf22149e22f56a06ac8f Mon Sep 17 00:00:00 2001
From: Vasyl Yurkovych <59879559+yurkovychv@users.noreply.github.com>
Date: Thu, 23 May 2024 11:03:18 +0300
Subject: [PATCH 3/4] Update runner-e2e-upgrade-tests.yml

---
 .github/workflows/runner-e2e-upgrade-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/runner-e2e-upgrade-tests.yml b/.github/workflows/runner-e2e-upgrade-tests.yml
index 86b5e48a..ba15b057 100644
--- a/.github/workflows/runner-e2e-upgrade-tests.yml
+++ b/.github/workflows/runner-e2e-upgrade-tests.yml
@@ -382,7 +382,7 @@ jobs:
             --volumes-from pmm-integration-server-data \
             --name pmm-integration-server \
             ${{ steps.pmm_server_to_image.outputs.IMAGE }}
-          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://${{ env.PMM_SERVER_IP }}/v1/version)" != "200" ]]; do echo "waiting for ${{ env.PMM_SERVER_IP }}" && sleep 2; done' || false
+          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u admin:${{ env.ADMIN_PASSWORD}} http://${{ env.PMM_SERVER_IP }}/v1/version)" != "200" ]]; do echo "waiting for ${{ env.PMM_SERVER_IP }}" && sleep 2; done' || false
 
       - name: 'Upgrade pmm-server: <Podman way>'
         if: ${{ inputs.upgrade_type == 'Podman way' }}
@@ -395,7 +395,7 @@ jobs:
           podman pull docker.io/${{ steps.pmm_server_to_image.outputs.IMAGE }}
           systemctl --user restart pmm-server
 
-          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://${{ env.PMM_SERVER_IP }}/v1/version)" != "200" ]]; do echo "waiting for ${{ env.PMM_SERVER_IP }}" && sleep 2; done' || false
+          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u admin:${{ env.ADMIN_PASSWORD}} http://${{ env.PMM_SERVER_IP }}/v1/version)" != "200" ]]; do echo "waiting for ${{ env.PMM_SERVER_IP }}" && sleep 2; done' || false
 
       - name: 'Tests <before PMM Client> upgrade'
         working-directory: ./pmm-ui-tests/playwright-tests

From 0ef748ec7011cc5da95da2fdf089a6d7e08e281b Mon Sep 17 00:00:00 2001
From: Vasyl Yurkovych <59879559+yurkovychv@users.noreply.github.com>
Date: Thu, 23 May 2024 11:16:25 +0300
Subject: [PATCH 4/4] Update runner-e2e-upgrade-tests.yml

---
 .github/workflows/runner-e2e-upgrade-tests.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/runner-e2e-upgrade-tests.yml b/.github/workflows/runner-e2e-upgrade-tests.yml
index ba15b057..b50819f5 100644
--- a/.github/workflows/runner-e2e-upgrade-tests.yml
+++ b/.github/workflows/runner-e2e-upgrade-tests.yml
@@ -382,7 +382,8 @@ jobs:
             --volumes-from pmm-integration-server-data \
             --name pmm-integration-server \
             ${{ steps.pmm_server_to_image.outputs.IMAGE }}
-          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u admin:${{ env.ADMIN_PASSWORD}} http://${{ env.PMM_SERVER_IP }}/v1/version)" != "200" ]]; do echo "waiting for ${{ env.PMM_SERVER_IP }}" && sleep 2; done' || false
+          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://${{ env.PMM_SERVER_IP }}/v1/readyz)" != "200" ]]; do echo "waiting for ${{ env.PMM_SERVER_IP }}" && sleep 2; done' || false
+          sleep 30
 
       - name: 'Upgrade pmm-server: <Podman way>'
         if: ${{ inputs.upgrade_type == 'Podman way' }}
@@ -395,7 +396,8 @@ jobs:
           podman pull docker.io/${{ steps.pmm_server_to_image.outputs.IMAGE }}
           systemctl --user restart pmm-server
 
-          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u admin:${{ env.ADMIN_PASSWORD}} http://${{ env.PMM_SERVER_IP }}/v1/version)" != "200" ]]; do echo "waiting for ${{ env.PMM_SERVER_IP }}" && sleep 2; done' || false
+          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://${{ env.PMM_SERVER_IP }}/v1/readyz)" != "200" ]]; do echo "waiting for ${{ env.PMM_SERVER_IP }}" && sleep 2; done' || false
+          sleep 30
 
       - name: 'Tests <before PMM Client> upgrade'
         working-directory: ./pmm-ui-tests/playwright-tests