From 20e6ba2416f2217626cc7d2d6e8f6cba8bdfbaea Mon Sep 17 00:00:00 2001 From: Vadym Yarosh Date: Fri, 23 Feb 2024 12:13:22 +0100 Subject: [PATCH 01/11] PMM-12921 fb integration fixes --- .github/workflows/fb-integration-suite.yml | 6 ++++-- .github/workflows/runner-integration-cli-tests.yml | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/fb-integration-suite.yml b/.github/workflows/fb-integration-suite.yml index 4d38705f..3c17c199 100644 --- a/.github/workflows/fb-integration-suite.yml +++ b/.github/workflows/fb-integration-suite.yml @@ -35,7 +35,7 @@ on: jobs: pmm-server-tests: - name: 'PMM Server ${{needs.get_versions.outputs.finish_version}} containers tests' + name: 'CLI / Integration' uses: ./.github/workflows/runner-integration-cli-tests.yml secrets: inherit with: @@ -46,11 +46,12 @@ jobs: pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} cli_test: 'pmm-server-only' + test_name: 'pmm-server container tests' # [ps5.7, ps8, ms8.0, pdpgsql13, pdpgsql14, pdpgsql15, modb4.4, modb5, modb6, help, generic, clientContainer, haproxy, proxysql, remove] pmm-client-container-tests: - name: 'PMM Client Docker Container tests' + name: 'CLI / Integration' uses: ./.github/workflows/runner-integration-cli-tests.yml secrets: inherit with: @@ -62,3 +63,4 @@ jobs: pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} cli_test: 'pmm-client-docker' services_list: '--setup-pmm-client-docker' + test_name: ${{ inputs.test_name > '' && format('{0} {1}', inputs.test_name, matrix.os) || matrix.os }} \ No newline at end of file diff --git a/.github/workflows/runner-integration-cli-tests.yml b/.github/workflows/runner-integration-cli-tests.yml index 73a05dfb..b00a45d8 100644 --- a/.github/workflows/runner-integration-cli-tests.yml +++ b/.github/workflows/runner-integration-cli-tests.yml @@ -32,6 +32,9 @@ on: description: "playwright test arguments to execute tests" required: false type: string + test_name: + type: string + required: false sha: description: "SHA (leave empty if running manually, default - 'null')" required: false @@ -39,6 +42,7 @@ on: jobs: cli-tests: + name: ${{ inputs.test_name || inputs.cli_test}} runs-on: ubuntu-latest timeout-minutes: 40 env: @@ -102,9 +106,9 @@ jobs: run: | docker create -v /srv --name pmm-server-data ${{ env.PMM_SERVER_IMAGE }} docker run -d -p 80:80 -p 443:443 -p 9000:9000 --name pmm-server \ - -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 + -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 \ --restart always ${{ env.PMM_SERVER_IMAGE }} timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://127.0.0.1/v1/readyz)" != "200" ]]; do sleep 2; done' || false From 4bd1751420bf2305f47ca7b19ce65b1fb3bf4df7 Mon Sep 17 00:00:00 2001 From: Vadym Yarosh Date: Fri, 23 Feb 2024 12:22:22 +0100 Subject: [PATCH 02/11] PMM-12921 fb integration fixes 0 --- .github/workflows/runner-integration-cli-tests.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/runner-integration-cli-tests.yml b/.github/workflows/runner-integration-cli-tests.yml index b00a45d8..4d60c261 100644 --- a/.github/workflows/runner-integration-cli-tests.yml +++ b/.github/workflows/runner-integration-cli-tests.yml @@ -105,11 +105,10 @@ jobs: - name: 'Setup : "${{ env.PMM_SERVER_IMAGE }}"' run: | docker create -v /srv --name pmm-server-data ${{ env.PMM_SERVER_IMAGE }} - docker run -d -p 80:80 -p 443:443 -p 9000:9000 --name pmm-server \ + docker run -d -p 80:80 -p 443:443 -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 \ - --restart always ${{ env.PMM_SERVER_IMAGE }} + -e PERCONA_TEST_PLATFORM_PUBLIC_KEY=RWTg+ZmCCjt7O8eWeAmTLAqW+1ozUbpRSKSwNTmO+exlS5KEIPYWuYdX \ + --volumes-from pmm-server-data --name pmm-server --restart always ${{ env.PMM_SERVER_IMAGE }} timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://127.0.0.1/v1/readyz)" != "200" ]]; do sleep 2; done' || false - name: 'Setup PMM Client: <${{ env.PMM_CLIENT_VERSION }}>' From 9ce493dbd015598f5fda183e71995221a9d07545 Mon Sep 17 00:00:00 2001 From: Vadym Yarosh Date: Fri, 23 Feb 2024 17:07:00 +0100 Subject: [PATCH 03/11] PMM-12921 fb integration added more jobs --- .github/workflows/fb-integration-suite.yml | 84 ++++++++++++++++++- .../runner-integration-cli-tests.yml | 8 +- 2 files changed, 82 insertions(+), 10 deletions(-) diff --git a/.github/workflows/fb-integration-suite.yml b/.github/workflows/fb-integration-suite.yml index 3c17c199..a987647c 100644 --- a/.github/workflows/fb-integration-suite.yml +++ b/.github/workflows/fb-integration-suite.yml @@ -34,6 +34,20 @@ on: type: string jobs: + help-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'pmm-ui-tests/cli/tests/help.spec.ts' + test_name: 'help tests' + pmm-server-tests: name: 'CLI / Integration' uses: ./.github/workflows/runner-integration-cli-tests.yml @@ -48,8 +62,6 @@ jobs: cli_test: 'pmm-server-only' test_name: 'pmm-server container tests' - # [ps5.7, ps8, ms8.0, pdpgsql13, pdpgsql14, pdpgsql15, modb4.4, modb5, modb6, help, generic, clientContainer, haproxy, proxysql, remove] - pmm-client-container-tests: name: 'CLI / Integration' uses: ./.github/workflows/runner-integration-cli-tests.yml @@ -63,4 +75,70 @@ jobs: pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} cli_test: 'pmm-client-docker' services_list: '--setup-pmm-client-docker' - test_name: ${{ inputs.test_name > '' && format('{0} {1}', inputs.test_name, matrix.os) || matrix.os }} \ No newline at end of file + test_name: 'pmm-client docker' + + ps-57-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'pmm-ui-tests/cli/tests/perconaMySqlServer.spec.ts' + services_list: '--ps-version=5.7 --addclient=ps,1' + test_name: 'Percona Server 5.7' + + ps-80-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'pmm-ui-tests/cli/tests/perconaMySqlServer.spec.ts' + services_list: '--ps-version=8.0 --addclient=ps,1' + test_name: 'Percona Server 8.0' + + mysql-80-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'pmm-ui-tests/cli/tests/mysql.spec.ts pmm-ui-tests/cli/tests/mysql-conf-file.spec.ts' + services_list: '--ms-version=8.0 --addclient=ms,1' + test_name: 'MySQL 8.0' + +# pdpgsql13, + +# pdpgsql14, + +# pdpgsql15, + +# modb4.4, + +# modb5, + +# modb6, + +# generic, + +# haproxy, + +# proxysql, + +# remove ] + diff --git a/.github/workflows/runner-integration-cli-tests.yml b/.github/workflows/runner-integration-cli-tests.yml index 4d60c261..fe4602e6 100644 --- a/.github/workflows/runner-integration-cli-tests.yml +++ b/.github/workflows/runner-integration-cli-tests.yml @@ -114,17 +114,11 @@ jobs: - name: 'Setup PMM Client: <${{ env.PMM_CLIENT_VERSION }}>' run: sudo -E bash -x ./pmm-tests/pmm2-client-setup.sh --pmm_server_ip 127.0.0.1 --client_version ${{ env.PMM_CLIENT_VERSION }} --admin_password admin --use_metrics_mode no - - name: 'Run env setup' + - name: 'Run env setup: ${{ inputs.services_list }}' if: ${{ !!inputs.services_list }} run: | sudo -E bash -x ./pmm-tests/pmm-framework.sh ${{ inputs.services_list }} --pmm2 - - name: Run Client Container Setup - if: ${{ matrix.db-type == 'clientContainer' }} - run: | - sudo -E bash -x ./pmm-tests/pmm-framework.sh --setup-pmm-client-docker --pmm2 - - - name: 'Run CLI tests: ${{ inputs.cli_test }}' working-directory: ./pmm-ui-tests/cli run: npx playwright test ${{ inputs.cli_test }} --quiet From 47660d6b1ee668367f480e8057ec0c11d11ad7e2 Mon Sep 17 00:00:00 2001 From: Vadym Yarosh Date: Sat, 24 Feb 2024 17:21:06 +0100 Subject: [PATCH 04/11] PMM-12921 fb integration added all jobs --- .github/workflows/fb-integration-suite.yml | 245 ++++++++++++++++++++- 1 file changed, 235 insertions(+), 10 deletions(-) diff --git a/.github/workflows/fb-integration-suite.yml b/.github/workflows/fb-integration-suite.yml index a987647c..43f72f7a 100644 --- a/.github/workflows/fb-integration-suite.yml +++ b/.github/workflows/fb-integration-suite.yml @@ -33,6 +33,27 @@ on: required: false type: string + workflow_call: + inputs: + pmm_ui_tests_branch: + required: false + type: string + pmm_qa_branch: + required: false + type: string + pmm_server_image: + required: true + type: string + pmm_client_image: + required: true + type: string + pmm_client_version: + required: true + type: string + sha: + required: false + type: string + jobs: help-tests: name: 'CLI / Integration' @@ -77,6 +98,35 @@ jobs: services_list: '--setup-pmm-client-docker' test_name: 'pmm-client docker' + generic-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'generic unregister' + test_name: 'Generic' + + remove-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'pmm-ui-tests/cli/tests/remove.spec.ts' + services_list: '--pxc-version=5.7 --addclient=pxc,1' + test_name: 'Remove' + ps-57-tests: name: 'CLI / Integration' uses: ./.github/workflows/runner-integration-cli-tests.yml @@ -122,23 +172,198 @@ jobs: services_list: '--ms-version=8.0 --addclient=ms,1' test_name: 'MySQL 8.0' -# pdpgsql13, + pdpgsql-13-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'postgreSql' + services_list: '--pdpgsql-version=13 --addclient=pdpgsql,1' + test_name: 'PD PostgreSQL 13' + + pdpgsql-14-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'postgreSql' + services_list: '--pdpgsql-version=14 --addclient=pdpgsql,1' + test_name: 'PD PostgreSQL 14' -# pdpgsql14, + pdpgsql-15-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'postgreSql' + services_list: '--pdpgsql-version=15 --addclient=pdpgsql,1' + test_name: 'PD PostgreSQL 15' + + mongo-44-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'pmm-ui-tests/cli/tests/mongoDb.spec.ts' + services_list: '--modb-version=4.4 --addclient=modb,1' + test_name: 'MongoDB 4.4' + + mongo-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'pmm-ui-tests/cli/tests/mongoDb.spec.ts' + services_list: '--modb-version=5 --addclient=modb,1' + test_name: 'MongoDB 5.x' -# pdpgsql15, + mongo-6-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'pmm-ui-tests/cli/tests/mongoDb.spec.ts' + services_list: '--modb-version=6 --addclient=modb,1' + test_name: 'MongoDB 6.x' -# modb4.4, + mongo-7-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'pmm-ui-tests/cli/tests/mongoDb.spec.ts' + services_list: '--modb-version=7 --addclient=modb,1' + test_name: 'MongoDB 7.x' -# modb5, + psmdb-44-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'pmm-ui-tests/cli/tests/mongoDb-psmdb.spec.ts' + services_list: '--mo-version=4.4 --mongomagic --with-shard' + test_name: 'PSMDB 4.4' -# modb6, + 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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'pmm-ui-tests/cli/tests/mongoDb-psmdb.spec.ts' + services_list: '--mo-version=5 --mongomagic --with-shard' + test_name: 'PSMDB 5.x' -# generic, + psmdb-6-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'pmm-ui-tests/cli/tests/mongoDb-psmdb.spec.ts' + services_list: '--mo-version=6 --mongomagic --with-shard' + test_name: 'PSMDB 6.x' -# haproxy, + psmdb-7-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'pmm-ui-tests/cli/tests/mongoDb-psmdb.spec.ts' + services_list: '--mo-version=7 --mongomagic --with-shard' + test_name: 'PSMDB 7.x' -# proxysql, + haproxy-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'haproxy' + services_list: '--addclient=haproxy,1' + test_name: 'HA Proxy' -# remove ] + proxysql-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 || 'main' }} + pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} + pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} + pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} + cli_test: 'proxySql' + services_list: '--pxc-version=5.7 --addclient=pxc,1' + test_name: 'PXC 5.7' From 23a96757166d7442e0ca1dd79a409e8d73cf0b83 Mon Sep 17 00:00:00 2001 From: Vadym Yarosh Date: Sat, 24 Feb 2024 17:24:04 +0100 Subject: [PATCH 05/11] PMM-12921 renaming --- .github/workflows/fb-integration-suite.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fb-integration-suite.yml b/.github/workflows/fb-integration-suite.yml index 43f72f7a..31ef44bf 100644 --- a/.github/workflows/fb-integration-suite.yml +++ b/.github/workflows/fb-integration-suite.yml @@ -81,7 +81,7 @@ jobs: pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} cli_test: 'pmm-server-only' - test_name: 'pmm-server container tests' + test_name: 'pmm-server container' pmm-client-container-tests: name: 'CLI / Integration' From a219902f206d66e684fe9bdbe9c83301539c6ee3 Mon Sep 17 00:00:00 2001 From: Vadym Yarosh Date: Sat, 24 Feb 2024 17:26:59 +0100 Subject: [PATCH 06/11] PMM-12921 cleanup --- .github/workflows/package-test-fb.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/package-test-fb.yml b/.github/workflows/package-test-fb.yml index 6e6ed766..e1aa85c2 100644 --- a/.github/workflows/package-test-fb.yml +++ b/.github/workflows/package-test-fb.yml @@ -16,6 +16,7 @@ on: default: "perconalab/pmm-server:dev-latest" pmm_client_tarball: description: "PMM Client tarball link or FB-code" + default: 'dev-latest' type: string required: true playbook: @@ -45,33 +46,23 @@ on: workflow_call: inputs: package_testing_branch: - description: 'Target branch for package-testing repository' type: string - default: 'master' required: false pmm_server_image: - description: "pmm-server docker image" required: true type: string - default: "perconalab/pmm-server:dev-latest" pmm_client_tarball: - description: "PMM Client tarball link or FB-code" type: string required: true playbook: - description: 'Select test to run:' - default: 'pmm2-client_integration' required: true type: string metrics_mode: - description: 'Select the Metrics Mode for PMM Client:' default: 'auto' type: string test_name: - description: 'Name of the test to pretty display in checks list' type: string sha: - description: "SHA (leave empty if running manually, default - 'null')" required: false type: string From 4efdfa9cad7c2fcfc6d1868a9eea68a25c82b3ae Mon Sep 17 00:00:00 2001 From: Vadym Yarosh Date: Sat, 24 Feb 2024 17:38:23 +0100 Subject: [PATCH 07/11] PMM-12921 node fixes --- .github/workflows/runner-integration-cli-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/runner-integration-cli-tests.yml b/.github/workflows/runner-integration-cli-tests.yml index fe4602e6..902bda4d 100644 --- a/.github/workflows/runner-integration-cli-tests.yml +++ b/.github/workflows/runner-integration-cli-tests.yml @@ -125,14 +125,14 @@ jobs: - name: Generate and Attach the report if: ${{ failure() && !!inputs.cli_test }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "report-${{ matrix.db-type }}" path: ./pmm-ui-tests/cli/test-report - name: Create status check if: ${{ always() }} - uses: percona/gh-action-github-status-action@v1 + uses: percona/gh-action-github-status-action@master continue-on-error: true with: authToken: ${{ secrets.GITHUB_TOKEN }} From f78e923ed4c90297a4313dc91635ece4bc3c277f Mon Sep 17 00:00:00 2001 From: Vadym Yarosh Date: Sat, 24 Feb 2024 17:58:44 +0100 Subject: [PATCH 08/11] PMM-12921 renaming --- .github/workflows/fb-tarball-suite.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fb-tarball-suite.yml b/.github/workflows/fb-tarball-suite.yml index 85a028d3..39c02615 100644 --- a/.github/workflows/fb-tarball-suite.yml +++ b/.github/workflows/fb-tarball-suite.yml @@ -73,7 +73,7 @@ jobs: pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} pmm_client_tarball: ${{ inputs.pmm_client_tarball || 'dev-latest' }} playbook: 'pmm2-client_integration_custom_port' - test_name: 'Tarball install' + test_name: 'tarball install' sha: ${{ inputs.sha || github.event.pull_request.head.sha || 'null' }} tarball_upgrade: @@ -85,5 +85,5 @@ jobs: pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} pmm_client_tarball: ${{ inputs.pmm_client_tarball || 'dev-latest' }} playbook: 'pmm2-client_integration_upgrade_custom_path' - test_name: 'Tarball upgrade' + test_name: 'tarball upgrade' sha: ${{ inputs.sha || github.event.pull_request.head.sha || 'null' }} \ No newline at end of file From 6dcd27a611e9c6744192c3a5254ac3ae1c9d9464 Mon Sep 17 00:00:00 2001 From: Vadym Yarosh Date: Sat, 24 Feb 2024 18:47:46 +0100 Subject: [PATCH 09/11] PMM-12921 actions versions fix --- .github/workflows/integration-cli-tests.yml | 4 ++-- .github/workflows/runner-integration-cli-tests.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration-cli-tests.yml b/.github/workflows/integration-cli-tests.yml index 8a362caa..569fc4df 100644 --- a/.github/workflows/integration-cli-tests.yml +++ b/.github/workflows/integration-cli-tests.yml @@ -76,7 +76,7 @@ jobs: steps: - name: Create status check if: ${{ env.SHA != 'null' }} - uses: percona/gh-action-github-status-action@update-node + uses: percona/gh-action-github-status-action@master continue-on-error: true with: authToken: ${{ secrets.GITHUB_TOKEN }} @@ -277,7 +277,7 @@ jobs: - name: Create status check if: ${{ always() }} - uses: percona/gh-action-github-status-action@update-node + uses: percona/gh-action-github-status-action@master continue-on-error: true with: authToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/runner-integration-cli-tests.yml b/.github/workflows/runner-integration-cli-tests.yml index 902bda4d..1d711abb 100644 --- a/.github/workflows/runner-integration-cli-tests.yml +++ b/.github/workflows/runner-integration-cli-tests.yml @@ -60,7 +60,7 @@ jobs: steps: - name: Create status check if: ${{ env.SHA != 'null' }} - uses: percona/gh-action-github-status-action@v1 + uses: percona/gh-action-github-status-action@master continue-on-error: true with: authToken: ${{ secrets.GITHUB_TOKEN }} From 7e35a7cd6d60ef9a32814c30a163351995dd5f06 Mon Sep 17 00:00:00 2001 From: Vadym Yarosh Date: Sat, 24 Feb 2024 19:00:08 +0100 Subject: [PATCH 10/11] PMM-12921 fixed generic tests --- .github/workflows/runner-integration-cli-tests.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/runner-integration-cli-tests.yml b/.github/workflows/runner-integration-cli-tests.yml index 1d711abb..47cdb9be 100644 --- a/.github/workflows/runner-integration-cli-tests.yml +++ b/.github/workflows/runner-integration-cli-tests.yml @@ -50,11 +50,22 @@ jobs: PMM_QA_BRANCH: ${{ inputs.pmm_qa_branch || 'main' }} PMM_UI_TESTS_BRANCH: ${{ inputs.pmm_ui_tests_branch || 'main' }} PMM_CLIENT_VERSION: ${{ inputs.pmm_client_version || 'dev-latest' }} + ### used in tests ### PMM_SERVER_IMAGE: ${{ inputs.pmm_server_image || 'perconalab/pmm-client:dev-latest' }} - ### used in pmm-framework.sh ### + # TODO: rename and update tests to use PMM_CLIENT_IMAGE instead + CLIENT_IMAGE: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} + + # TODO: rename and update tests to use PMM_CLIENT_VERSION instead + CLIENT_VERSION: ${{ inputs.pmm_client_version || 'dev-latest' }} + + # TODO: used in pmm-framework.sh as well. Remove setup dependency on this var. + # TODO: update tests to use PMM_SERVER_IMAGE instead DOCKER_VERSION: ${{ inputs.pmm_server_image || 'perconalab/pmm-client:dev-latest' }} + + # TODO: used in pmm-framework.sh as well. Remove setup dependency on this var. + # TODO: update tests to use PMM_SERVER_IMAGE instead CLIENT_DOCKER_VERSION: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} steps: From 134f1f12adcd5d91cdaa4ad86f2d03ef06bfb77d Mon Sep 17 00:00:00 2001 From: Vadym Yarosh Date: Sun, 25 Feb 2024 18:28:13 +0100 Subject: [PATCH 11/11] PMM-12921 disabled mongo tests --- .github/workflows/fb-integration-suite.yml | 117 +++++++++++---------- 1 file changed, 60 insertions(+), 57 deletions(-) diff --git a/.github/workflows/fb-integration-suite.yml b/.github/workflows/fb-integration-suite.yml index 31ef44bf..d69b4ad3 100644 --- a/.github/workflows/fb-integration-suite.yml +++ b/.github/workflows/fb-integration-suite.yml @@ -217,65 +217,68 @@ jobs: services_list: '--pdpgsql-version=15 --addclient=pdpgsql,1' test_name: 'PD PostgreSQL 15' - mongo-44-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 || 'main' }} - pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} - pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} - pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} - pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} - cli_test: 'pmm-ui-tests/cli/tests/mongoDb.spec.ts' - services_list: '--modb-version=4.4 --addclient=modb,1' - test_name: 'MongoDB 4.4' + # FIXME: PMM-12966 +# mongo-44-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 || 'main' }} +# pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} +# pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} +# pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} +# pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} +# cli_test: 'pmm-ui-tests/cli/tests/mongoDb.spec.ts' +# services_list: '--modb-version=4.4 --addclient=modb,1' +# test_name: 'MongoDB 4.4' - mongo-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 || 'main' }} - pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} - pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} - pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} - pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} - cli_test: 'pmm-ui-tests/cli/tests/mongoDb.spec.ts' - services_list: '--modb-version=5 --addclient=modb,1' - test_name: 'MongoDB 5.x' + # FIXME: PMM-12966 +# mongo-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 || 'main' }} +# pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} +# pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} +# pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} +# pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} +# cli_test: 'pmm-ui-tests/cli/tests/mongoDb.spec.ts' +# services_list: '--modb-version=5 --addclient=modb,1' +# test_name: 'MongoDB 5.x' - mongo-6-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 || 'main' }} - pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} - pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} - pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} - pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} - cli_test: 'pmm-ui-tests/cli/tests/mongoDb.spec.ts' - services_list: '--modb-version=6 --addclient=modb,1' - test_name: 'MongoDB 6.x' - - mongo-7-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 || 'main' }} - pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} - pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} - pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} - pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} - cli_test: 'pmm-ui-tests/cli/tests/mongoDb.spec.ts' - services_list: '--modb-version=7 --addclient=modb,1' - test_name: 'MongoDB 7.x' + # FIXME: PMM-12966 +# mongo-6-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 || 'main' }} +# pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} +# pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} +# pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} +# pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} +# cli_test: 'pmm-ui-tests/cli/tests/mongoDb.spec.ts' +# services_list: '--modb-version=6 --addclient=modb,1' +# test_name: 'MongoDB 6.x' + # FIXME: PMM-12966 +# mongo-7-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 || 'main' }} +# pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }} +# pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }} +# pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }} +# pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }} +# cli_test: 'pmm-ui-tests/cli/tests/mongoDb.spec.ts' +# services_list: '--modb-version=7 --addclient=modb,1' +# test_name: 'MongoDB 7.x' psmdb-44-tests: name: 'CLI / Integration'