Skip to content

Commit

Permalink
Merge branch 'main' into PMM7-FixTest
Browse files Browse the repository at this point in the history
  • Loading branch information
saikumar-vs authored Jun 27, 2024
2 parents a62152a + 2a0fac5 commit 639292c
Show file tree
Hide file tree
Showing 168 changed files with 22,827 additions and 8,025 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
# Order is important; the last matching pattern takes the most precedence.

* @yurkovychv @puneet0191 @vyarosh
* @yurkovychv @puneet0191 @saikumar-vs @peterSirotnak
17 changes: 8 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,16 @@ jobs:
- name: Run lint:tests
run: npm run lint:tests

fb_tests:
name: FB UI tests
uses: Percona-Lab/pmm-submodules/.github/workflows/pmm2-ui-tests-fb.yml@PMM-2.0
e2e_fb_tests:
name: e2e FB tests
uses: percona/pmm-qa/.github/workflows/fb-e2e-suite.yml@main
secrets:
BACKUP_LOCATION_ACCESS_KEY: ${{ secrets.BACKUP_LOCATION_ACCESS_KEY }}
BACKUP_LOCATION_SECRET_KEY: ${{ secrets.BACKUP_LOCATION_SECRET_KEY }}
with:
server_image: 'perconalab/pmm-server:dev-latest'
client_version: 'dev-latest'
client_image: 'perconalab/pmm-client:dev-latest'

sha: 'null'
pmm_ui_tests_branch: ${{ github.head_ref }}
pmm_qa_branch: 'main'
pmm_ui_branch: ${{ github.head_ref }}
sha: 'null'
pmm_server_image: 'perconalab/pmm-server:dev-latest'
pmm_client_image: 'perconalab/pmm-client:dev-latest'
pmm_client_version: 'dev-latest'
8 changes: 4 additions & 4 deletions .github/workflows/pmm-ui-tests-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
description: 'pmm-ui-tests repository branch'
default: 'main'
required: true
pmm_qa_branch:
description: 'pmm-qa repository branch(for setup)'
default: 'main'
required: true
pmm_server_version:
description: 'PMM Server docker image'
default: 'perconalab/pmm-server:dev-latest'
Expand All @@ -17,10 +21,6 @@ on:
description: 'PMM Client version to test (dev-latest|pmm2-latest|pmm2-rc|x.xx.x)'
default: 'dev-latest'
required: true
pmm_qa_branch:
description: 'pmm-qa repository branch(for setup)'
default: 'main'
required: true

jobs:
rbac:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pmm-ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
steps:
- name: PMM server version ${{ inputs.pmm_server_version }} and UI tests for flag "${{ inputs.pmm_test_flag }}" and pmm-ui-tests branch ${{ inputs.pmm_ui_tests_branch }}
if: ${{ env.SHA != 'null' }}
uses: percona/gh-action-Sibz-github-status-action@v1
uses: percona/gh-action-github-status-action@v1
continue-on-error: true
with:
authToken: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
path: ./pmm-ui-tests/playwright-tests/playwright-report

- name: Create status check
uses: percona/gh-action-Sibz-github-status-action@v1
uses: percona/gh-action-github-status-action@v1
if: ${{ env.SHA != 'null' && always() }}
continue-on-error: true
with:
Expand Down
126 changes: 0 additions & 126 deletions .github/workflows/pmm-upgrade-ui-tests-matrix-full.yml

This file was deleted.

122 changes: 0 additions & 122 deletions .github/workflows/pmm-upgrade-ui-tests-matrix.yml

This file was deleted.

Loading

0 comments on commit 639292c

Please sign in to comment.