From e3d51ebaf4f24e3a7d17b40b00ff588ca99e06a8 Mon Sep 17 00:00:00 2001 From: panchal-yash Date: Fri, 1 Sep 2023 15:30:04 +0530 Subject: [PATCH] clean things --- .github/workflows/PMM_PS.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/PMM_PS.yaml b/.github/workflows/PMM_PS.yaml index 91246ec..f2e7538 100644 --- a/.github/workflows/PMM_PS.yaml +++ b/.github/workflows/PMM_PS.yaml @@ -34,22 +34,23 @@ jobs: - name: PS_VERSION ENV Setup run: | if [[ -n "${{ github.event.inputs.ps_version }}" ]]; then - PS_VERSION="${{ github.event.inputs.ps_version }}" - PS_VERSION_PATH=$(echo "ps-$PS_VERSION") + PS_VERSION_FULL="${{ github.event.inputs.ps_version }}" + PS_VERSION_PATH=$(echo "ps-$PS_VERSION_FULL") + PS_VERSION=$(echo ${PS_VERSION_FULL%-*}) else wget https://raw.githubusercontent.com/Percona-QA/package-testing/master/VERSIONS - PS_VERSION="$(grep 'PS80_VER' VERSIONS | cut -d = -f 2)" - PS_VERSION_PATH=$(echo "ps-$PS_VERSION") - PS_VERSION_SCRIPT=$(echo ${PS_VERSION%-*}) + PS_VERSION_FULL="$(grep 'PS80_VER' VERSIONS | cut -d = -f 2)" + PS_VERSION_PATH=$(echo "ps-$PS_VERSION_FULL") + PS_VERSION=$(echo ${PS_VERSION_FULL%-*}) fi - echo "PS_VERSION=${PS_VERSION}" >> $GITHUB_ENV + echo "PS_VERSION=${PS_VERSION}" | sed 's/"//g' >> $GITHUB_ENV echo "PS_VERSION_PATH=${PS_VERSION_PATH}" >> $GITHUB_ENV - echo "PS_VERSION_SCRIPT=${PS_VERSION_SCRIPT}" | sed 's/"//g' >> $GITHUB_ENV + echo "PS_VERSION_FULL=${PS_VERSION_FULL}" >> $GITHUB_ENV - name: Concatenate values to environment file run: | - echo "PS_TARBALL_PATH=https://downloads.percona.com/downloads/TESTING/${{env.PS_VERSION_PATH}}/Percona-Server-${{env.PS_VERSION}}-Linux.x86_64.glibc${{env.PS_GLIBC}}.tar.gz" >> $GITHUB_ENV + echo "PS_TARBALL_PATH=https://downloads.percona.com/downloads/TESTING/${{env.PS_VERSION_PATH}}/Percona-Server-${{env.PS_VERSION_FULL}}-Linux.x86_64.glibc${{env.PS_GLIBC}}.tar.gz" >> $GITHUB_ENV echo "PMM_QA_REPO_URL=https://github.com/percona/pmm-qa/" >> $GITHUB_ENV echo "PMM_QA_REPO_BRANCH=main" >> $GITHUB_ENV @@ -92,7 +93,7 @@ jobs: run: sudo pmm-admin config --server-insecure-tls --server-url=https://admin:admin@localhost:443 - name: Run for PS tests - run: ./pmm-framework.sh --ps-version ${{ env.PS_VERSION_SCRIPT }} --setup-pmm-ps-integration --pmm2 --ps-tarball ${{ env.PS_TARBALL_PATH }} --query-source=slowlog + run: ./pmm-framework.sh --ps-version ${{ env.PS_VERSION }} --setup-pmm-ps-integration --pmm2 --ps-tarball ${{ env.PS_TARBALL_PATH }} --query-source=slowlog working-directory: pmm-qa/pmm-tests - name: Install Node js