Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PMM-12921 fb integration fixes #660

Merged
merged 11 commits into from
Feb 25, 2024
Merged

PMM-12921 fb integration fixes #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
20e6ba2
PMM-12921 fb integration fixes
Feb 23, 2024
4bd1751
PMM-12921 fb integration fixes 0
Feb 23, 2024
9ce493d
PMM-12921 fb integration added more jobs
Feb 23, 2024
47660d6
PMM-12921 fb integration added all jobs
Feb 24, 2024
23a9675
PMM-12921 renaming
Feb 24, 2024
a219902
PMM-12921 cleanup
Feb 24, 2024
4efdfa9
PMM-12921 node fixes
Feb 24, 2024
f78e923
PMM-12921 renaming
Feb 24, 2024
6dcd27a
PMM-12921 actions versions fix
Feb 24, 2024
7e35a7c
PMM-12921 fixed generic tests
Feb 24, 2024
134f1f1
PMM-12921 disabled mongo tests
Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
316 changes: 312 additions & 4 deletions .github/workflows/fb-integration-suite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,44 @@ 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'
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: 'PMM Server ${{needs.get_versions.outputs.finish_version}} containers tests'
name: 'CLI / Integration'
uses: ./.github/workflows/runner-integration-cli-tests.yml
secrets: inherit
with:
Expand All @@ -46,11 +81,10 @@ 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'

# [ps5.7, ps8, ms8.0, pdpgsql13, pdpgsql14, pdpgsql15, modb4.4, modb5, modb6, help, generic, clientContainer, haproxy, proxysql, remove]
test_name: 'pmm-server container'

pmm-client-container-tests:
name: 'PMM Client Docker Container tests'
name: 'CLI / Integration'
uses: ./.github/workflows/runner-integration-cli-tests.yml
secrets: inherit
with:
Expand All @@ -62,3 +96,277 @@ jobs:
pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
cli_test: 'pmm-client-docker'
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
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'

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'

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'

# 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'

# 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'

# 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'
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'

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'

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'

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'

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'

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'

4 changes: 2 additions & 2 deletions .github/workflows/fb-tarball-suite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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' }}
4 changes: 2 additions & 2 deletions .github/workflows/integration-cli-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
Loading
Loading