Skip to content

Commit 9148d1d

Browse files
author
Vadym Yarosh
committed
PMM-12921 fixed fb integration args
1 parent f46974d commit 9148d1d

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

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

-8
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,10 @@ on:
3434
type: string
3535

3636
jobs:
37-
get_versions:
38-
name: Get versions
39-
uses: ./.github/workflows/pmm-version-getter.yml
40-
with:
41-
repository: ${{ inputs.pmm_server_case || 'release candidate'}}
42-
4337
pmm-server-tests:
4438
name: 'PMM Server ${{needs.get_versions.outputs.finish_version}} containers tests'
4539
uses: ./.github/workflows/runner-integration-cli-tests.yml
4640
secrets: inherit
47-
needs: get_versions
4841
with:
4942
sha: ${{ inputs.sha || github.event.pull_request.head.sha || 'null' }}
5043
pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
@@ -60,7 +53,6 @@ jobs:
6053
name: 'PMM Client Docker Container tests'
6154
uses: ./.github/workflows/runner-integration-cli-tests.yml
6255
secrets: inherit
63-
needs: get_versions
6456
with:
6557
sha: ${{ inputs.sha || github.event.pull_request.head.sha || 'null' }}
6658
pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
default: 'perconalab/pmm-server:dev-latest'
1616
required: true
1717
type: string
18-
client_image:
18+
pmm_client_image:
1919
description: "pmm2-client docker image, default perconalab/pmm-client:dev-latest"
2020
required: false
2121
type: string
@@ -47,10 +47,10 @@ jobs:
4747
PMM_UI_TESTS_BRANCH: ${{ inputs.pmm_ui_tests_branch || 'main' }}
4848
PMM_CLIENT_VERSION: ${{ inputs.pmm_client_version || 'dev-latest' }}
4949
### used in tests ###
50-
PMM_SERVER_IMAGE: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
50+
PMM_SERVER_IMAGE: ${{ inputs.pmm_server_image || 'perconalab/pmm-client:dev-latest' }}
5151

5252
### used in pmm-framework.sh ###
53-
DOCKER_VERSION: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
53+
DOCKER_VERSION: ${{ inputs.pmm_server_image || 'perconalab/pmm-client:dev-latest' }}
5454
CLIENT_DOCKER_VERSION: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
5555

5656
steps:

0 commit comments

Comments
 (0)