From 635bf0e701e4b159134c9f5bad3bf721026bb56f Mon Sep 17 00:00:00 2001 From: Saikumar Date: Thu, 2 May 2024 00:02:21 +0530 Subject: [PATCH] Updates --- .github/workflows/integration-cli-tests.yml | 8 ++++---- .../runner-integration-cli-tests.yml | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration-cli-tests.yml b/.github/workflows/integration-cli-tests.yml index 678c04ab..75357aec 100644 --- a/.github/workflows/integration-cli-tests.yml +++ b/.github/workflows/integration-cli-tests.yml @@ -169,7 +169,7 @@ jobs: 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/mysql.spec.ts pmm-ui-tests/cli/tests/mysql-conf-file.spec.ts' + cli_test: 'pmm-ui-tests/cli/tests/mysql.spec.ts pmm-ui-tests/cli/tests/mysql-conf-file.spec.ts --workers=1' services_list: '--database mysql=8.0' test_name: 'MySQL 8.0' @@ -184,7 +184,7 @@ jobs: 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: 'postgreSql' + cli_test: 'postgreSql --workers=1' services_list: '--database pdpgsql=14' test_name: 'PD PostgreSQL 14' @@ -199,7 +199,7 @@ jobs: 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: 'postgreSql' + cli_test: 'postgreSql --workers=1' services_list: '--database pdpgsql=15' test_name: 'PD PostgreSQL 15' @@ -214,7 +214,7 @@ jobs: 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: 'postgreSql' + cli_test: 'postgreSql --workers=1' services_list: '--database pdpgsql=16' test_name: 'PD PostgreSQL 16' diff --git a/.github/workflows/runner-integration-cli-tests.yml b/.github/workflows/runner-integration-cli-tests.yml index d9a1a5f2..1c5cb88c 100644 --- a/.github/workflows/runner-integration-cli-tests.yml +++ b/.github/workflows/runner-integration-cli-tests.yml @@ -120,9 +120,22 @@ jobs: -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: Sleep for 30 seconds - run: sleep 30s - shell: bash + - name: Wait for PMM Server to start + run: | + wait-for-url() { + echo "Testing $1" + 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!" + if curl -I $1; then + echo "PMM Server is ready" + else + echo "PMM Server is not ready" + fi + } + wait-for-url https://127.0.0.1/v1/readyz - name: 'Setup PMM Client: <${{ env.PMM_CLIENT_VERSION }}>' working-directory: qa-integration/pmm_qa