Merge branch 'PMM-2.0' into PMM-12757-environment-summary-error

.github/workflows/pmm2-testsuite.yml

@@ -187,22 +187,29 @@ jobs:
       - name: Run Setup for PSMDB 4.4
         working-directory: pmm-integration
         if: ${{ matrix.db-type == 'modb4.4' }}
-        run: sudo npx ts-node ./integration-setup.ts --ci --addclient=modb,1 --mo-version=4.4
+        run: |
+          sudo npx ts-node ./integration-setup.ts --ci --addclient=modb,1 --mo-version=4
+          sudo -E bash -x ../pmm-tests/pmm-framework.sh --addclient=modb,1 --mo-version=4 --with-shard --mongomagic    
 
       - name: Run Setup for PSMDB 5
         working-directory: pmm-integration
         if: ${{ matrix.db-type == 'modb5' }}
-        run: sudo npx ts-node ./integration-setup.ts --ci --addclient=modb,1 --mo-version=5
+        run: |
+          sudo npx ts-node ./integration-setup.ts --ci --addclient=modb,1 --mo-version=5
+          sudo -E bash -x ../pmm-tests/pmm-framework.sh --addclient=modb,1 --mo-version=5 --with-shard --mongomagic
 
       - name: Run Setup for PSMDB 6
         working-directory: pmm-integration
         if: ${{ matrix.db-type == 'modb6' }}
-        run: sudo npx ts-node ./integration-setup.ts --ci --addclient=modb,1 --mo-version=6
+        run: |
+          sudo npx ts-node ./integration-setup.ts --ci --addclient=modb,1 --mo-version=6
+          sudo -E bash -x ../pmm-tests/pmm-framework.sh --addclient=modb,1 --mo-version=6 --with-shard --mongomagic
 
       - name: Run CLI tests for PSMDB
         if: ${{ matrix.db-type == 'modb6' || matrix.db-type == 'modb5' || matrix.db-type == 'modb4.4' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test pmm-ui-tests/cli/tests/mongoDb-psmdb.spec.ts --quiet
+        run: |
+          npx playwright test pmm-ui-tests/cli/tests/mongoDb-psmdb.spec.ts --quiet
 
 # TODO: Add setup for the official MongoDB and run "npx playwright test pmm-ui-tests/cli/tests/mongoDb.spec.ts"
 

.github/workflows/pmm2-ui-tests-fb.yml

@@ -106,6 +106,20 @@ jobs:
       #      tags_for_tests: '@bm-common|@bm-locations' -- include bm-common once setup for mysql fixed
       tags_for_tests: '@bm-locations'
 
+  exporters:
+    name: Exporters tests
+    uses: ./.github/workflows/ui-tests.yml
+    secrets: inherit
+    with:
+      server_image: ${{ inputs.server_image || 'perconalab/pmm-server:dev-latest' }}
+      client_version: ${{ inputs.client_version || 'dev-latest' }}
+      client_image: ${{ inputs.client_image || 'perconalab/pmm-client:dev-latest' }}
+      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
+      pmm_ui_branch: ${{ inputs.pmm_ui_branch || 'main' }}
+      sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
+      client_flags: '--mongo-replica-for-backup'
+      tags_for_tests: '@mongodb-exporter|@exporters'
+
   instances:
     name: Instances UI tests
     uses: ./.github/workflows/ui-tests.yml
@@ -215,3 +229,39 @@ jobs:
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
       client_flags: '--addclient=ps,1 --addclient=modb,1 --addclient=pdpgsql,1'
       tags_for_tests: '@user-password'
+
+  dump_tool:
+    name: Dump Tool UI tests
+    uses: ./.github/workflows/ui-tests.yml
+    secrets: inherit
+    with:
+      server_image: ${{ inputs.server_image || 'perconalab/pmm-server:dev-latest' }}
+      client_version: ${{ inputs.client_version || 'dev-latest' }}
+      client_image: ${{ inputs.client_image || 'perconalab/pmm-client:dev-latest' }}
+      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
+      pmm_ui_branch: ${{ inputs.pmm_ui_branch || 'main' }}
+      sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
+      client_flags: '--addclient=ps,1'
+      tags_for_tests: '@dump'
+
+  tarball_install:
+    name: Tarball Install test
+    uses: Percona-QA/package-testing/.github/workflows/pmm-package-test-fb.yml@master
+    secrets: inherit
+    with:
+      package_testing_branch: 'master'
+      pmm_server_image: ${{ inputs.pmm_server_image }}
+      pmm_client_tarball: ${{ inputs.client_version || 'dev-latest' }}
+      playbook: 'pmm2-client_integration_custom_port'
+      test_name: 'Tarball install'
+
+  tarball_upgrade:
+    name: Tarball Upgrade test
+    uses: Percona-QA/package-testing/.github/workflows/pmm-package-test-fb.yml@master
+    secrets: inherit
+    with:
+      package_testing_branch: 'master'
+      pmm_server_image: ${{ inputs.server_image || 'perconalab/pmm-server:dev-latest' }}
+      pmm_client_tarball: ${{ inputs.client_version || 'dev-latest' }}
+      playbook: 'pmm2-client_integration_upgrade_custom_path'
+      test_name: 'Tarball upgrade'

.github/workflows/ui-tests.yml

@@ -45,6 +45,7 @@ jobs:
       SERVER_IMAGE: ${{ inputs.server_image || 'perconalab/pmm-server:dev-latest' }}
       CLIENT_IMAGE: ${{ inputs.client_image || 'perconalab/pmm-client:dev-latest' }}
       CLIENT_VERSION: ${{ inputs.client_version || 'dev-latest' }}
+      PMM_CLIENT_VERSION: ${{ inputs.client_version || 'dev-latest' }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       ADMIN_PASSWORD: 'admin-password'
       PMM_QA_BRANCH: ${{ inputs.pmm_qa_branch || 'main' }}
@@ -144,6 +145,13 @@ jobs:
             return `artifacts_for_${process.env.TAGS_FOR_TESTS.replaceAll('|', '')}`
           result-encoding: string
 
+      - uses: actions/upload-artifact@v4
+        if: ${{ always() }}
+        with:
+          name: ${{ steps.artifact_name.outputs.result }}
+          path: |
+            pmm-ui-tests/tests/output/*.png
+
       - name: Create status check
         if: ${{ github.event_name != 'pull_request' && always() }}
         uses: percona/gh-action-github-status-action@v1

.gitmodules

@@ -16,7 +16,7 @@
 [submodule "mongodb_exporter"]
 	path = sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
 	url = https://github.com/percona/mongodb_exporter.git
-	branch = release-0.40.0
+	branch = main
 [submodule "postgres_exporter"]
 	path = sources/postgres_exporter/src/github.com/percona/postgres_exporter
 	url = https://github.com/percona/postgres_exporter

VERSION

@@ -1 +1 @@
-2.41.1
+2.41.2

ci-default.yml

@@ -20,7 +20,7 @@ deps:
     component: client
 
   - name: mongodb_exporter
-    branch: release-0.40.0
+    branch: main
     path: sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
     url: https://github.com/percona/mongodb_exporter
     component: client

requirements.txt

@@ -1,3 +1,3 @@
-pyaml==23.9.5
-GitPython==3.1.40
-PyGithub==1.59.1
+pyaml==23.12.0
+GitPython==3.1.42
+PyGithub==2.2.0