Commit 9148d1d Vadym Yarosh
committed
1 parent f46974d commit 9148d1d Copy full SHA for 9148d1d
File tree 2 files changed +3
-11
lines changed
2 files changed +3
-11
lines changed Original file line number Diff line number Diff line change 34
34
type : string
35
35
36
36
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
-
43
37
pmm-server-tests :
44
38
name : ' PMM Server ${{needs.get_versions.outputs.finish_version}} containers tests'
45
39
uses : ./.github/workflows/runner-integration-cli-tests.yml
46
40
secrets : inherit
47
- needs : get_versions
48
41
with :
49
42
sha : ${{ inputs.sha || github.event.pull_request.head.sha || 'null' }}
50
43
pmm_ui_tests_branch : ${{ inputs.pmm_ui_tests_branch || 'main' }}
60
53
name : ' PMM Client Docker Container tests'
61
54
uses : ./.github/workflows/runner-integration-cli-tests.yml
62
55
secrets : inherit
63
- needs : get_versions
64
56
with :
65
57
sha : ${{ inputs.sha || github.event.pull_request.head.sha || 'null' }}
66
58
pmm_ui_tests_branch : ${{ inputs.pmm_ui_tests_branch || 'main' }}
Original file line number Diff line number Diff line change 15
15
default : ' perconalab/pmm-server:dev-latest'
16
16
required : true
17
17
type : string
18
- client_image :
18
+ pmm_client_image :
19
19
description : " pmm2-client docker image, default perconalab/pmm-client:dev-latest"
20
20
required : false
21
21
type : string
@@ -47,10 +47,10 @@ jobs:
47
47
PMM_UI_TESTS_BRANCH : ${{ inputs.pmm_ui_tests_branch || 'main' }}
48
48
PMM_CLIENT_VERSION : ${{ inputs.pmm_client_version || 'dev-latest' }}
49
49
# ## 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' }}
51
51
52
52
# ## 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' }}
54
54
CLIENT_DOCKER_VERSION : ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
55
55
56
56
steps :
You can’t perform that action at this time.
0 commit comments