From c07513df6987d961625002e59c61db26d5b2be30 Mon Sep 17 00:00:00 2001
From: saikumar-vs <112166980+saikumar-vs@users.noreply.github.com>
Date: Tue, 7 May 2024 11:06:17 +0530
Subject: [PATCH] Changes for PMM3 and new pmm-framework (#674)

* Changes for PMM3 and new pmm-framework
---
 .github/workflows/integration-cli-tests.yml   | 20 +++----------------
 .../runner-integration-cli-tests.yml          |  6 ++----
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/integration-cli-tests.yml b/.github/workflows/integration-cli-tests.yml
index e7393a19..740623f1 100644
--- a/.github/workflows/integration-cli-tests.yml
+++ b/.github/workflows/integration-cli-tests.yml
@@ -111,6 +111,7 @@ jobs:
       pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:3-dev-latest' }}
       pmm_client_version: ${{ inputs.pmm_client_version || '3-dev-latest' }}
       cli_test: 'generic unregister --workers=1'
+      services_list: '--database pdpgsql=16'
       test_name: 'Generic'
 
   remove-tests:
@@ -280,21 +281,6 @@ jobs:
   #      services_list: '--modb-version=7 --addclient=modb,1'
   #      test_name: 'MongoDB 7.x'
 
-  psmdb-5-tests:
-    name: 'CLI / Integration'
-    uses: ./.github/workflows/runner-integration-cli-tests.yml
-    secrets: inherit
-    with:
-      sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
-      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
-      qa_integration_branch: ${{ inputs.qa_integration_branch || 'v3' }}
-      pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:3-dev-latest' }}
-      pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:3-dev-latest' }}
-      pmm_client_version: ${{ inputs.pmm_client_version || '3-dev-latest' }}
-      cli_test: 'pmm-ui-tests/cli/tests/mongoDb-psmdb.spec.ts'
-      services_list: '--database psmdb=5,SETUP_TYPE=pss'
-      test_name: 'PSMDB 5.x'
-
   psmdb-6-tests:
     name: 'CLI / Integration'
     uses: ./.github/workflows/runner-integration-cli-tests.yml
@@ -307,7 +293,7 @@ jobs:
       pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:3-dev-latest' }}
       pmm_client_version: ${{ inputs.pmm_client_version || '3-dev-latest' }}
       cli_test: 'pmm-ui-tests/cli/tests/mongoDb-psmdb.spec.ts'
-      services_list: '--database psmdb=6,SETUP_TYPE=shards'
+      services_list: '--database psmdb=6.0,SETUP_TYPE=pss --verbose'
       test_name: 'PSMDB 6.x'
 
   psmdb-7-tests:
@@ -322,7 +308,7 @@ jobs:
       pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:3-dev-latest' }}
       pmm_client_version: ${{ inputs.pmm_client_version || '3-dev-latest' }}
       cli_test: 'pmm-ui-tests/cli/tests/mongoDb-psmdb.spec.ts'
-      services_list: '--database psmdb=7,SETUP_TYPE=shards'
+      services_list: '--database psmdb=7.0,SETUP_TYPE=pss --verbose'
       test_name: 'PSMDB 7.x'
 
   haproxy-tests:
diff --git a/.github/workflows/runner-integration-cli-tests.yml b/.github/workflows/runner-integration-cli-tests.yml
index 76011bb0..0769a93b 100644
--- a/.github/workflows/runner-integration-cli-tests.yml
+++ b/.github/workflows/runner-integration-cli-tests.yml
@@ -118,10 +118,8 @@ jobs:
           docker run -d -p 80:80 -p 443:8443 -p 9000:9000 \
             -e PERCONA_TEST_PLATFORM_ADDRESS=https://check-dev.percona.com:443 \
             -e PERCONA_TEST_PLATFORM_PUBLIC_KEY=RWTg+ZmCCjt7O8eWeAmTLAqW+1ozUbpRSKSwNTmO+exlS5KEIPYWuYdX \
-            --volumes-from pmm-server-data --name pmm-server --restart always ${{ env.PMM_SERVER_IMAGE }}
-
-      - name: Wait for PMM Server to start
-        run: sleep 30
+            --volumes-from pmm-server-data --name pmm-server --restart always ${{ env.PMM_SERVER_IMAGE }} 
+          timeout 240 bash -c 'while [[ "$(curl -k -s -o /dev/null -w ''%{http_code}'' https://127.0.0.1:443/v1/readyz)" != "200" ]]; do sleep 2; done' || false
 
       - name: 'Setup PMM Client: <${{ env.PMM_CLIENT_VERSION }}>'
         working-directory: qa-integration/pmm_qa