PMM-12921 fb integration fixes

Author: Vadym Yarosh

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

@@ -35,7 +35,7 @@ on:
 
 jobs:
   pmm-server-tests:
-    name: 'PMM Server ${{needs.get_versions.outputs.finish_version}} containers tests'
+    name: 'CLI / Integration'
     uses: ./.github/workflows/runner-integration-cli-tests.yml
     secrets: inherit
     with:
@@ -46,11 +46,12 @@ jobs:
       pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
       pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
       cli_test: 'pmm-server-only'
+      test_name: 'pmm-server container tests'
 
   # [ps5.7, ps8, ms8.0, pdpgsql13, pdpgsql14, pdpgsql15, modb4.4, modb5, modb6, help, generic, clientContainer, haproxy, proxysql, remove]
 
   pmm-client-container-tests:
-    name: 'PMM Client Docker Container tests'
+    name: 'CLI / Integration'
     uses: ./.github/workflows/runner-integration-cli-tests.yml
     secrets: inherit
     with:
@@ -62,3 +63,4 @@ jobs:
       pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
       cli_test: 'pmm-client-docker'
       services_list: '--setup-pmm-client-docker'
+      test_name: ${{ inputs.test_name > '' && format('{0} {1}', inputs.test_name, matrix.os) || matrix.os }}

.github/workflows/runner-integration-cli-tests.yml

@@ -32,13 +32,17 @@ on:
         description: "playwright test arguments to execute tests"
         required: false
         type: string
+      test_name:
+        type: string
+        required: false
       sha:
         description: "SHA (leave empty if running manually, default - 'null')"
         required: false
         type: string
 
 jobs:
   cli-tests:
+    name: ${{ inputs.test_name || inputs.cli_test}}
     runs-on: ubuntu-latest
     timeout-minutes: 40
     env:
@@ -102,9 +106,9 @@ jobs:
         run: |
           docker create -v /srv --name pmm-server-data ${{ env.PMM_SERVER_IMAGE }}
           docker run -d -p 80:80 -p 443:443 -p 9000:9000 --name pmm-server \
-            -e PERCONA_TEST_PLATFORM_ADDRESS=https://check-dev.percona.com:443
-            -e PERCONA_TEST_PLATFORM_PUBLIC_KEY=RWTg+ZmCCjt7O8eWeAmTLAqW+1ozUbpRSKSwNTmO+exlS5KEIPYWuYdX 
-          --volumes-from pmm-server-data  
+            -e PERCONA_TEST_PLATFORM_ADDRESS=https://check-dev.percona.com:443 \
+            -e PERCONA_TEST_PLATFORM_PUBLIC_KEY=RWTg+ZmCCjt7O8eWeAmTLAqW+1ozUbpRSKSwNTmO+exlS5KEIPYWuYdX \ 
+          --volumes-from pmm-server-data \
           --restart always ${{ env.PMM_SERVER_IMAGE }}
           timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://127.0.0.1/v1/readyz)" != "200" ]]; do sleep 2; done' || false