Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions .github/workflows/e2e-upgrade-tests-matrix-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:
inputs:
pmm_ui_tests_branch:
description: 'pmm-ui-tests repository branch'
default: 'main'
default: 'v3'
required: true
pmm_qa_branch:
description: 'pmm-qa repository branch(for setup)'
default: 'main'
default: 'v3'
required: true
repository:
description: 'Upgrade to:'
Expand All @@ -24,7 +24,7 @@ on:
- dev-latest
versions_range:
description: 'Last versions range:'
default: 5
default: '5'
required: true

jobs:
Expand All @@ -46,13 +46,13 @@ jobs:
old_version: ${{ fromJSON(needs.get_versions.outputs.version_matrix) }}
upgrade_type: ["UI way", "Docker way", "Podman way"]
with:
pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
pre_upgrade_tests: '@config-pre-upgrade'
post_upgrade_tests: '@config-post-upgrade'
pmm_server_start_version: ${{ matrix.old_version }}
pmm_client_start_version: ${{ matrix.old_version }}
upgrade_type: ${{ matrix.upgrade_type }}
pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
services_list: ''
repository: ${{ inputs.repository || 'dev-latest'}}
version_string_from: ${{needs.get_versions.outputs.start_version}}
Expand All @@ -69,13 +69,13 @@ jobs:
old_version: ${{ fromJSON(needs.get_versions.outputs.version_matrix) }}
upgrade_type: ["UI way", "Docker way", "Podman way"]
with:
pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
pre_upgrade_tests: '@rbac-pre-upgrade'
post_upgrade_tests: '@rbac-post-upgrade'
pmm_server_start_version: ${{ matrix.old_version }}
pmm_client_start_version: ${{ matrix.old_version }}
upgrade_type: ${{ matrix.upgrade_type }}
pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
services_list: '--addclient=ps,1 --addclient=pdpgsql,1'
repository: ${{ inputs.repository || 'dev-latest'}}
version_string_from: ${{needs.get_versions.outputs.start_version}}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/e2e-upgrade-tests-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:
inputs:
pmm_ui_tests_branch:
description: 'pmm-ui-tests repository branch'
default: 'main'
default: 'v3'
required: true
pmm_qa_branch:
description: 'pmm-qa repository branch(for setup)'
default: 'main'
default: 'v3'
required: true
upgrade_type:
description: 'Upgrade way:'
Expand Down Expand Up @@ -50,13 +50,13 @@ jobs:
matrix:
old_version: ${{ fromJSON(needs.get_versions.outputs.version_matrix) }}
with:
pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
pre_upgrade_tests: '@config-pre-upgrade'
post_upgrade_tests: '@config-post-upgrade'
pmm_server_start_version: ${{ matrix.old_version }}
pmm_client_start_version: ${{ matrix.old_version }}
upgrade_type: ${{ inputs.upgrade_type || 'Docker way' }}
pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
services_list: ''
repository: ${{ inputs.repository || 'dev-latest'}}
version_string_from: ${{needs.get_versions.outputs.start_version}}
Expand All @@ -72,13 +72,13 @@ jobs:
matrix:
old_version: ${{ fromJSON(needs.get_versions.outputs.version_matrix) }}
with:
pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
pre_upgrade_tests: '@rbac-pre-upgrade'
post_upgrade_tests: '@rbac-post-upgrade'
pmm_server_start_version: ${{ matrix.old_version }}
pmm_client_start_version: ${{ matrix.old_version }}
upgrade_type: ${{ inputs.upgrade_type || 'Docker way' }}
pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
services_list: '--addclient=ps,1 --addclient=pdpgsql,1'
repository: ${{ inputs.repository || 'dev-latest'}}
version_string_from: ${{needs.get_versions.outputs.start_version}}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e-upgrade-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ on:
inputs:
pmm_ui_tests_branch:
description: 'pmm-ui-tests repository branch'
default: 'main'
default: 'v3'
required: true
pmm_qa_branch:
description: 'pmm-qa repository branch(for setup)'
default: 'main'
default: 'v3'
required: true
pmm_server_start_version:
description: 'PMM Server version to upgrade (latest|dev-latest|x.xx.x|x.xx.x-rc)'
Expand Down Expand Up @@ -42,12 +42,12 @@ on:
inputs:
pmm_ui_tests_branch:
description: 'pmm-ui-tests repository branch'
default: 'main'
default: 'v3'
type: string
required: true
pmm_qa_branch:
description: 'pmm-qa repository branch(for setup)'
default: 'main'
default: 'v3'
type: string
required: true
pmm_server_start_version:
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/integration-cli-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -387,3 +387,18 @@ jobs:
cli_test: 'proxySql'
services_list: '--database pxc=8.0'
test_name: 'PXC 8.0'

external-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: 'external'
services_list: '--database=external'
test_name: 'External'
22 changes: 11 additions & 11 deletions .github/workflows/package-test-matrix-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
uses: ./.github/workflows/package-test-single.yml
secrets: inherit
with:
package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
package_testing_branch: ${{ inputs.package_testing_branch || 'v3' }}
package: ${{ inputs.package || 'pmm3-client' }}
repository: ${{ inputs.repository || 'dev-latest' }}
metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
Expand All @@ -68,7 +68,7 @@ jobs:
uses: ./.github/workflows/package-test-single.yml
secrets: inherit
with:
package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
package_testing_branch: ${{ inputs.package_testing_branch || 'v3' }}
package: ${{ inputs.package || 'pmm3-client' }}
repository: ${{ inputs.repository || 'dev-latest' }}
metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
Expand All @@ -79,7 +79,7 @@ jobs:
uses: ./.github/workflows/package-test-single.yml
secrets: inherit
with:
package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
package_testing_branch: ${{ inputs.package_testing_branch || 'v3' }}
package: ${{ inputs.package || 'pmm3-client' }}
repository: ${{ inputs.repository || 'dev-latest' }}
metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
Expand All @@ -90,7 +90,7 @@ jobs:
uses: ./.github/workflows/package-test-single.yml
secrets: inherit
with:
package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
package_testing_branch: ${{ inputs.package_testing_branch || 'v3' }}
package: ${{ inputs.package || 'pmm3-client' }}
repository: ${{ inputs.repository || 'dev-latest' }}
metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
Expand All @@ -101,7 +101,7 @@ jobs:
uses: ./.github/workflows/package-test-single.yml
secrets: inherit
with:
package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
package_testing_branch: ${{ inputs.package_testing_branch || 'v3' }}
package: ${{ inputs.package || 'pmm3-client' }}
repository: ${{ inputs.repository || 'dev-latest' }}
metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
Expand All @@ -112,7 +112,7 @@ jobs:
uses: ./.github/workflows/package-test-single.yml
secrets: inherit
with:
package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
package_testing_branch: ${{ inputs.package_testing_branch || 'v3' }}
package: ${{ inputs.package || 'pmm3-client' }}
repository: ${{ inputs.repository || 'dev-latest' }}
metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
Expand All @@ -123,7 +123,7 @@ jobs:
uses: ./.github/workflows/package-test-single.yml
secrets: inherit
with:
package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
package_testing_branch: ${{ inputs.package_testing_branch || 'v3' }}
package: ${{ inputs.package || 'pmm3-client' }}
repository: ${{ inputs.repository || 'dev-latest' }}
metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
Expand All @@ -134,7 +134,7 @@ jobs:
uses: ./.github/workflows/package-test-single.yml
secrets: inherit
with:
package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
package_testing_branch: ${{ inputs.package_testing_branch || 'v3' }}
package: ${{ inputs.package || 'pmm3-client' }}
repository: ${{ inputs.repository || 'dev-latest' }}
metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
Expand All @@ -145,7 +145,7 @@ jobs:
uses: ./.github/workflows/package-test-single.yml
secrets: inherit
with:
package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
package_testing_branch: ${{ inputs.package_testing_branch || 'v3' }}
package: ${{ inputs.package || 'pmm3-client' }}
repository: ${{ inputs.repository || 'dev-latest' }}
metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
Expand All @@ -156,7 +156,7 @@ jobs:
uses: ./.github/workflows/package-test-single.yml
secrets: inherit
with:
package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
package_testing_branch: ${{ inputs.package_testing_branch || 'v3' }}
package: ${{ inputs.package || 'pmm3-client' }}
repository: ${{ inputs.repository || 'dev-latest' }}
metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
Expand All @@ -167,7 +167,7 @@ jobs:
uses: ./.github/workflows/package-test-single.yml
secrets: inherit
with:
package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
package_testing_branch: ${{ inputs.package_testing_branch || 'v3' }}
package: ${{ inputs.package || 'pmm3-client' }}
repository: ${{ inputs.repository || 'dev-latest' }}
metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/package-test-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
uses: ./.github/workflows/package-test-single.yml
secrets: inherit
with:
package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
package_testing_branch: ${{ inputs.package_testing_branch || 'v3' }}
package: ${{ inputs.package || 'pmm3-client' }}
repository: ${{ inputs.repository || 'dev-latest' }}
metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
Expand All @@ -67,7 +67,7 @@ jobs:
uses: ./.github/workflows/package-test-single.yml
secrets: inherit
with:
package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
package_testing_branch: ${{ inputs.package_testing_branch || 'v3' }}
package: ${{ inputs.package || 'pmm3-client' }}
repository: ${{ inputs.repository || 'dev-latest' }}
metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
Expand All @@ -80,7 +80,7 @@ jobs:
uses: ./.github/workflows/package-test-single.yml
secrets: inherit
with:
package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
package_testing_branch: ${{ inputs.package_testing_branch || 'v3' }}
package: ${{ inputs.package || 'pmm3-client' }}
repository: ${{ inputs.repository || 'dev-latest' }}
metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/runner-e2e-upgrade-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
inputs:
pmm_ui_tests_branch:
description: 'pmm-ui-tests repository branch'
default: 'main'
default: 'v3'
type: string
required: true
pre_upgrade_tests:
Expand Down Expand Up @@ -34,7 +34,7 @@ on:
type: string
pmm_qa_branch:
description: 'pmm-qa repository branch(for setup)'
default: 'main'
default: 'v3'
type: string
required: true
services_list:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/runner-package-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
timeout-minutes: 60
env:
SHA: ${{ inputs.sha || 'null' }}
PACKAGE_TESTING_BRANCH: ${{ inputs.package_testing_branch || 'master' }}
PACKAGE_TESTING_BRANCH: ${{ inputs.package_testing_branch || 'v3' }}
PMM_SERVER_IMAGE: ${{ inputs.pmm_server_image }}
TARBALL: ${{ inputs.pmm_client_tarball || 'null' }}
EXPECTED_VERSION: ${{ inputs.expected_version }}
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ pmm-tests/vendor/*

ps_socket*
.DS_Store

pmm-ui-tests/*
qa-integration/*
package-testing/*
Loading