PMM-12921 fixes (#659)

* PMM-12921 fixed fb integration inputs * PMM-12921 fixed fb integration args
percona · Feb 23, 2024 · 5c2b16c · 5c2b16c
1 parent 7baeb75
commit 5c2b16c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/.github/workflows/fb-integration-suite.yml b/.github/workflows/fb-integration-suite.yml
@@ -3,24 +3,29 @@ name: _FB integration CLI 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"
+      pmm_server_image:
+        description: 'PMM Server docker image'
+        default: 'perconalab/pmm-server:dev-latest'
         required: false
         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_tests_branch:
-        description: "Branch for PMM-UI(CLI) tests to checkout"
+      pmm_client_version:
+        description: "PMM Client Tarball link or Dev-latest"
+        default: 'dev-latest'
         required: false
         type: string
       sha:
@@ -29,17 +34,10 @@ on:
         type: string
 
 jobs:
-  get_versions:
-    name: Get versions
-    uses: ./.github/workflows/pmm-version-getter.yml
-    with:
-      repository: ${{ inputs.pmm_server_case || 'release candidate'}}
-
   pmm-server-tests:
     name: 'PMM Server ${{needs.get_versions.outputs.finish_version}} containers tests'
     uses: ./.github/workflows/runner-integration-cli-tests.yml
     secrets: inherit
-    needs: get_versions
     with:
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
       pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
@@ -55,7 +53,6 @@ jobs:
     name: 'PMM Client Docker Container tests'
     uses: ./.github/workflows/runner-integration-cli-tests.yml
     secrets: inherit
-    needs: get_versions
     with:
       sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
       pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}

diff --git a/.github/workflows/runner-integration-cli-tests.yml b/.github/workflows/runner-integration-cli-tests.yml
@@ -15,7 +15,7 @@ on:
         default: 'perconalab/pmm-server:dev-latest'
         required: true
         type: string
-      client_image:
+      pmm_client_image:
         description: "pmm2-client docker image, default perconalab/pmm-client:dev-latest"
         required: false
         type: string
@@ -47,10 +47,10 @@ jobs:
       PMM_UI_TESTS_BRANCH: ${{ inputs.pmm_ui_tests_branch || 'main' }}
       PMM_CLIENT_VERSION: ${{ inputs.pmm_client_version || 'dev-latest' }}
       ###  used in tests ###
-      PMM_SERVER_IMAGE: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
+      PMM_SERVER_IMAGE: ${{ inputs.pmm_server_image || 'perconalab/pmm-client:dev-latest' }}
 
       ### used in pmm-framework.sh ###
-      DOCKER_VERSION: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
+      DOCKER_VERSION: ${{ inputs.pmm_server_image || 'perconalab/pmm-client:dev-latest' }}
       CLIENT_DOCKER_VERSION: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
 
     steps: