PMM-13500: Fixes for the podman

Author: peterSirotnak

Diff for: .github/workflows/fb-e2e-suite.yml

@@ -179,6 +179,21 @@ jobs:
       setup_services: '--database ps --database psmdb --database pdpgsql'
       tags_for_tests: '@user-password'
 
+  user_and_password_podman:
+    name: User with changed password UI tests
+    uses: ./.github/workflows/runner-e2e-tests-podman.yml
+    secrets: inherit
+    with:
+      pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:3-dev-latest' }}
+      pmm_client_version: ${{ inputs.pmm_client_version || '3-dev-latest' }}
+      pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:3-dev-latest' }}
+      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
+      qa_integration_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
+      sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
+      setup_services: '--database ps --database psmdb --database pdpgsql'
+      tags_for_tests: '@user-password'
+
   pgsm:
     name: PGSM UI tests
     uses: ./.github/workflows/runner-e2e-tests-codeceptjs.yml
@@ -236,21 +251,6 @@ jobs:
       setup_services: '--database psmdb,SETUP_TYPE=pss'
       tags_for_tests: '@pmm-psmdb-replica-integration'
 
-  user_and_password_podman:
-    name: User with changed password UI tests
-    uses: ./.github/workflows/runner-e2e-tests-podman.yml
-    secrets: inherit
-    with:
-      pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:3-dev-latest' }}
-      pmm_client_version: ${{ inputs.pmm_client_version || '3-dev-latest' }}
-      pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:3-dev-latest' }}
-      pmm_qa_branch: 'v3'
-      qa_integration_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
-      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
-      sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
-      setup_services: '--addclient=ps,1 --addclient=modb,1'
-      tags_for_tests: '@user-password'
-
   dump_tool:
     name: Dump Tool UI tests
     uses: ./.github/workflows/runner-e2e-tests-codeceptjs.yml

Diff for: .github/workflows/runner-e2e-tests-podman.yml

@@ -150,7 +150,7 @@ jobs:
           popd
           sudo sysctl net.ipv4.ip_unprivileged_port_start=80
 
-      - name: Setup PMM2-Server
+      - name: Setup PMM3-Server
         working-directory: ./pmm-ui-tests
         run: |
           mkdir -p ~/.config/systemd/user/
@@ -227,8 +227,14 @@ jobs:
         run: sudo bash -x pmm3-client-setup.sh --pmm_server_ip 127.0.0.1 --client_version ${{ env.CLIENT_VERSION }} --admin_password ${{ env.ADMIN_PASSWORD }} --use_metrics_mode no
 
       - name: Run Setup for E2E Tests
-        working-directory: ./pmm-qa
-        run: sudo -E bash -x pmm-tests/pmm-framework.sh ${{ env.WIZARD_ARGS }} --pmm2
+        working-directory: qa-integration/pmm_qa
+        run: |
+          mkdir -m 777 -p /tmp/backup_data
+          python3 -m venv virtenv
+          . virtenv/bin/activate
+          pip install --upgrade pip
+          pip install -r requirements.txt
+          python pmm-framework.py --pmm-server-password=${{ env.ADMIN_PASSWORD }} --verbose ${{ env.WIZARD_ARGS }}
 
       - name: Setup npm modules for e2e tests
         working-directory: ./pmm-ui-tests