From 682483393f8953f17b3a58a29579a003d7f2b6d0 Mon Sep 17 00:00:00 2001 From: panchal-yash Date: Fri, 4 Aug 2023 12:59:54 +0530 Subject: [PATCH] add MS tarball path add glibc versions for tarball path --- .github/workflows/PMM_PS.yaml | 6 ++++++ pmm_ps_setup/start-pmm-ps.sh | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/PMM_PS.yaml b/.github/workflows/PMM_PS.yaml index 4210b73..f85b7bc 100644 --- a/.github/workflows/PMM_PS.yaml +++ b/.github/workflows/PMM_PS.yaml @@ -5,6 +5,9 @@ on: ps_version: description: "ps version" required: true + ms_version: + description: "ms version" + required: true pmm_image: description: "pmm_image" required: false @@ -22,6 +25,9 @@ jobs: timeout-minutes: 20 env: PS_VERSION: ${{ github.event.inputs.ps_version || '8.0.32-24' }} + PS_GLIBC: ${{ github.event.inputs.ps_glibc || '2.17' }} + MS_VERSION: ${{ github.event.inputs.ms_version || '8.0.32' }} + MS_GLIBC: ${{ github.event.inputs.ms_glibc || '2.28' }} PMM_IMAGE: ${{ github.event.inputs.pmm_image || 'perconalab/pmm-server:dev-latest' }} steps: - uses: actions/checkout@v2 diff --git a/pmm_ps_setup/start-pmm-ps.sh b/pmm_ps_setup/start-pmm-ps.sh index e17dccc..c3d342e 100644 --- a/pmm_ps_setup/start-pmm-ps.sh +++ b/pmm_ps_setup/start-pmm-ps.sh @@ -5,7 +5,9 @@ echo $PS_VERSION -PS_TARBALL_PATH=https://downloads.percona.com/downloads/TESTING/ps-$PS_VERSION/Percona-Server-$PS_VERSION-Linux.x86_64.glibc2.28.tar.gz +PS_TARBALL_PATH=https://downloads.percona.com/downloads/TESTING/ps-$PS_VERSION/Percona-Server-$PS_VERSION-Linux.x86_64.glibc$PS_GLIBC.tar.gz + +MS_TARBALL_PATH=https://dev.mysql.com/get/Downloads/MySQL-8/mysql-$MS_VERSION-linux-glibc$MS_GLIBC-x86_64.tar.xz PMM_QA_REPO_URL=https://github.com/percona/pmm-qa/ @@ -28,7 +30,7 @@ docker run --detach --restart always --publish 443:443 --name pmm-server $PMM_IM cd pmm-tests #Run for ms version and ms client 1 -./pmm-framework.sh --ps-version ps-$PS_VERSION --addclient=ms,1 --pmm2 --ms-tarball $PS_TARBALL_PATH +./pmm-framework.sh --ms-version ms-$PS_VERSION --addclient=ms,1 --pmm2 --ms-tarball $MS_TARBALL_PATH #Run for ps version and ps client 1