PMM-12921 more args fixes for FB calls (#661)

* PMM-12921 more args fixes for FB calls

* PMM-12921 fixed podman

* PMM-12921 fixed podman runner

* PMM-12921 fixed playwright call

* PMM-12921 fixed playwright call

* PMM-12921 updated cli test job

* PMM-12921 added fb reusing

.github/workflows/e2e-tests.yml

@@ -18,7 +18,7 @@ on:
         default: 'perconalab/pmm-server:dev-latest'
         required: true
       pmm_client_version:
-        description: 'PMM Client version to test (dev-latest|pmm2-latest|pmm2-rc|x.xx.x)'
+        description: 'PMM Client version (dev-latest|pmm2-latest|pmm2-rc|x.xx.x|https...)'
         default: 'dev-latest'
         required: true
 
@@ -32,7 +32,7 @@ jobs:
       pmm_test_flag: '@rbac'
       pmm_server_version: ${{ github.event.inputs.pmm_server_version || 'perconalab/pmm-server:dev-latest' }}
       pmm_client_version: ${{ github.event.inputs.pmm_client_version || 'dev-latest' }}
-      pmm_clients: '--addclient=ps,1 --addclient=pdpgsql,1'
+      setup_services: '--addclient=ps,1 --addclient=pdpgsql,1'
       pmm_qa_branch: ${{ github.event.inputs.pmm_qa_branch || 'main' }}
 
   portal:
@@ -44,7 +44,7 @@ jobs:
       pmm_test_flag: '@portal'
       pmm_server_version: ${{ github.event.inputs.pmm_server_version || 'perconalab/pmm-server:dev-latest' }}
       pmm_client_version: ${{ github.event.inputs.pmm_client_version || 'dev-latest' }}
-      pmm_clients: ''
+      setup_services: ''
       pmm_qa_branch: ${{ github.event.inputs.pmm_qa_branch || 'main' }}
 
   inventory:
@@ -56,5 +56,5 @@ jobs:
       pmm_test_flag: '@inventory'
       pmm_server_version: ${{ github.event.inputs.pmm_server_version || 'perconalab/pmm-server:dev-latest' }}
       pmm_client_version: ${{ github.event.inputs.pmm_client_version || 'dev-latest' }}
-      pmm_clients: '--addclient=modb,1 --addclient=ps,1 --addclient=pdpgsql,1'
+      setup_services: '--addclient=modb,1 --addclient=ps,1 --addclient=pdpgsql,1'
       pmm_qa_branch: ${{ github.event.inputs.pmm_qa_branch || 'main' }}

.github/workflows/fb-e2e-suite.yml

@@ -3,55 +3,55 @@ name: _FB e2e tests
 on:
   workflow_dispatch:
     inputs:
-      pmm_server_image:
-        description: "pmm-server docker image, default perconalab/pmm-server:dev-latest"
+      pmm_ui_tests_branch:
+        description: 'pmm-ui-tests repository branch(CLI tests)'
+        default: 'main'
         required: false
         type: string
-      pmm_client_version:
-        description: "pmm2-client version Tarball or Dev-latest, default is dev-latest"
+      pmm_qa_branch:
+        description: 'pmm-qa repository branch(for setup)'
+        default: 'main'
         required: false
         type: string
-      pmm_client_image:
-        description: "pmm2-client docker image, default perconalab/pmm-client:dev-latest"
-        required: false
+      pmm_server_image:
+        description: 'PMM Server docker image'
+        default: 'perconalab/pmm-server:dev-latest'
+        required: true
         type: string
-      pmm_qa_branch:
-        description: "Branch for PMM-QA to checkout"
+      pmm_client_image:
+        description: 'pmm2-client docker image'
+        default: 'perconalab/pmm-client:dev-latest'
         required: false
         type: string
-      pmm_ui_branch:
-        description: "Branch for PMM-UI tests to checkout"
+      pmm_client_version:
+        description: 'PMM Client version (dev-latest|pmm2-latest|pmm2-rc|x.xx.x|https...)'
+        default: 'dev-latest'
         required: false
         type: string
       sha:
-        description: "SHA (leave empty if running manually, default - 'null')"
+        description: "SHA (leave default if running manually)"
+        default: 'null'
         required: false
         type: string
 
   workflow_call:
     inputs:
-      pmm_server_image:
-        description: "pmm-server docker image, default perconalab/pmm-server:dev-latest"
+      pmm_ui_tests_branch:
         required: false
         type: string
-      pmm_client_version:
-        description: "pmm2-client version Tarball URL or Dev-latest, default is dev-latest"
+      pmm_qa_branch:
         required: false
         type: string
-      pmm_client_image:
-        description: "pmm2-client docker image, default perconalab/pmm-client:dev-latest"
-        required: false
+      pmm_server_image:
+        required: true
         type: string
-      pmm_qa_branch:
-        description: "Branch for PMM-QA to checkout"
+      pmm_client_image:
         required: false
         type: string
-      pmm_ui_branch:
-        description: "Branch for PMM-UI tests to checkout"
+      pmm_client_version:
         required: false
         type: string
       sha:
-        description: "SHA (leave empty if running manually, default - 'null')"
         required: false
         type: string
 
@@ -67,13 +67,13 @@ jobs:
     uses: ./.github/workflows/runner-e2e-tests-codeceptjs.yml
     secrets: inherit
     with:
+      sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
       pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }}
       pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
       pmm_client_image: ${{ inputs.pmm_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'
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
+      setup_services: '--mongo-replica-for-backup'
       tags_for_tests: '@bm-mongo'
 
 #  -- include backup_management_ps once setup for mysql fixed for the worker
@@ -86,9 +86,9 @@ jobs:
 #      pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
 #      pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
 #      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
-#      pmm_ui_branch: ${{ inputs.pmm_ui_branch || 'main' }}
+#      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
 #      sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
-#      client_flags: '--mongo-replica-for-backup --setup-bm-mysql'
+#      setup_services: '--mongo-replica-for-backup --setup-bm-mysql'
 #      tags_for_tests: '@bm-mysql'
 
   backup_management_common:
@@ -100,9 +100,9 @@ jobs:
       pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
       pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
       pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
-      pmm_ui_branch: ${{ inputs.pmm_ui_branch || 'main' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
-      client_flags: '--mongo-replica-for-backup --setup-bm-mysql'
+      setup_services: '--mongo-replica-for-backup --setup-bm-mysql'
       #      tags_for_tests: '@bm-common|@bm-locations' -- include bm-common once setup for mysql fixed
       tags_for_tests: '@bm-locations'
 
@@ -115,9 +115,9 @@ jobs:
       pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
       pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
       pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
-      pmm_ui_branch: ${{ inputs.pmm_ui_branch || 'main' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
-      client_flags: '--mongo-replica-for-backup'
+      setup_services: '--mongo-replica-for-backup'
       tags_for_tests: '@mongodb-exporter|@exporters'
 
   instances:
@@ -129,9 +129,9 @@ jobs:
       pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
       pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
       pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
-      pmm_ui_branch: ${{ inputs.pmm_ui_branch || 'main' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
-      client_flags: '--addclient=haproxy,1 --addclient=ps,1 --setup-external-service'
+      setup_services: '--addclient=haproxy,1 --addclient=ps,1 --setup-external-service'
       tags_for_tests: '@instances-fb'
 
   alerting_and_settings:
@@ -143,9 +143,9 @@ jobs:
       pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
       pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
       pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
-      pmm_ui_branch: ${{ inputs.pmm_ui_branch || 'main' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
-      client_flags: '--addclient=ms,1'
+      setup_services: '--addclient=ms,1'
       tags_for_tests: '@alerting-fb|@settings-fb'
 
   user_and_password:
@@ -157,9 +157,9 @@ jobs:
       pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
       pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
       pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
-      pmm_ui_branch: ${{ inputs.pmm_ui_branch || 'main' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
-      client_flags: '--addclient=ps,1 --addclient=modb,1 --addclient=pdpgsql,1'
+      setup_services: '--addclient=ps,1 --addclient=modb,1 --addclient=pdpgsql,1'
       tags_for_tests: '@user-password'
 
   pgsm:
@@ -171,9 +171,9 @@ jobs:
       pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
       pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
       pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
-      pmm_ui_branch: ${{ inputs.pmm_ui_branch || 'main' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
-      client_flags: '--setup-pmm-pgsm-integration'
+      setup_services: '--setup-pmm-pgsm-integration'
       tags_for_tests: '@pgsm-pmm-integration'
 
   pgss:
@@ -185,21 +185,21 @@ jobs:
       pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
       pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
       pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
-      pmm_ui_branch: ${{ inputs.pmm_ui_branch || 'main' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
-      client_flags: '--setup-pmm-pgss-integration'
+      setup_services: '--setup-pmm-pgss-integration'
       tags_for_tests: '@pgss-pmm-integration'
 
   rbac:
     name: RBAC UI tests
-    uses: percona/pmm-qa/.github/workflows/runner-e2e-tests-playwright.yml@main
+    uses: ./.github/workflows/runner-e2e-tests-playwright.yml
     secrets: inherit
     with:
-      pmm_ui_tests_branch: ${{ inputs.pmm_ui_branch || 'main '}}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main '}}
       pmm_test_flag: '@rbac'
       pmm_server_version: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }}
-      pmm_pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
-      pmm_clients: '--addclient=ps,1'
+      pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
+      setup_services: '--addclient=ps,1'
       pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
 
   psmdb_arbiter:
@@ -211,23 +211,23 @@ jobs:
       pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
       pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
       pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
-      pmm_ui_branch: ${{ inputs.pmm_ui_branch || 'main' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
-      client_flags: '--mongomagic --with-arbiter'
+      setup_services: '--mongomagic --with-arbiter'
       tags_for_tests: '@pmm-psmdb-arbiter-integration'
 
   user_and_password_podman:
     name: User with changed password UI tests
-    uses: ./.github/workflows/ui-tests-podman.yml
+    uses: ./.github/workflows/runner-e2e-tests-podman.yml
     secrets: inherit
     with:
       pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }}
       pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
       pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
       pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
-      pmm_ui_branch: ${{ inputs.pmm_ui_branch || 'main' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
-      client_flags: '--addclient=ps,1 --addclient=modb,1 --addclient=pdpgsql,1'
+      setup_services: '--addclient=ps,1 --addclient=modb,1 --addclient=pdpgsql,1'
       tags_for_tests: '@user-password'
 
   dump_tool:
@@ -239,7 +239,7 @@ jobs:
       pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
       pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
       pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
-      pmm_ui_branch: ${{ inputs.pmm_ui_branch || 'main' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
-      client_flags: '--addclient=ps,1'
+      setup_services: '--addclient=ps,1'
       tags_for_tests: '@dump'