Merge branch 'PMM-2.0' of github.com:Percona-Lab/pmm-submodules into …

…PMM-11349-base-file-migration
Percona-Lab · Jul 13, 2023 · 8fa9e61 · 8fa9e61
2 parents 5ffc640 + 625138c
commit 8fa9e61
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/pmm2-ui-tests-fb.yml b/.github/workflows/pmm2-ui-tests-fb.yml
@@ -184,8 +184,7 @@ jobs:
     with:
       pmm_ui_tests_branch: ${{ inputs.pmm_ui_branch || 'main '}}
       pmm_test_flag: '@rbac'
-      pmm_server_version: 'dev-latest'
-      pmm_server_docker_tag: ${{ inputs.server_image || 'perconalab/pmm-server:dev-latest' }}
+      pmm_server_version: ${{ inputs.server_image || 'perconalab/pmm-server:dev-latest' }}
       pmm_client_version: ${{ inputs.client_version || 'dev-latest' }}
       pmm_clients: '--addclient=ps,1'
       pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
diff --git a/sources/grafana-dashboards b/sources/grafana-dashboards
diff --git a/sources/grafana/src/github.com/grafana/grafana b/sources/grafana/src/github.com/grafana/grafana
diff --git a/sources/pmm-qa/src/github.com/percona/pmm-qa b/sources/pmm-qa/src/github.com/percona/pmm-qa
diff --git a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests
diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm
diff --git a/sources/rds_exporter/src/github.com/percona/rds_exporter b/sources/rds_exporter/src/github.com/percona/rds_exporter