Skip to content

Commit 8ef01bf

Browse files
authored
PMM2 fix gh for qa-integration (#105)
1 parent 3b99d58 commit 8ef01bf

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.github/workflows/PMM_PROXYSQL.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,24 @@ jobs:
3131

3232
- name: PXC_VERSION ENV Setup
3333
run: |
34-
if [[ -n "${{ github.event.inputs.pxc_version }}" ]]; then
34+
if [[ "${{ github.event.inputs.pxc_version }}" != http* ]]; then
3535
PXC_VERSION="${{ github.event.inputs.pxc_version }}"
3636
PXC_VERSION_PATH=$(echo "pxc-$PXC_VERSION")
3737
PXC_VERSION_TRIMED=$(echo ${PXC_VERSION%-*})
3838
else
3939
wget https://raw.githubusercontent.com/Percona-QA/package-testing/master/VERSIONS
4040
PXC_VERSION="$(grep 'PXC80_VER' VERSIONS | cut -d = -f 2)"
41-
PXC_VERSION_PATH=$(echo "pxc-$PXC_VERSION.1")
42-
PXC_VERSION_TRIMED=$(echo ${PXC_VERSION%-*})
41+
PXC_VERSION_PATH=$(echo "pxc-$PXC_VERSION")
42+
PXC_VERSION_TRIMED="pxc-$(echo "${PXC_VERSION%-*}" | cut -d'-' -f1)"
4343
fi
4444
echo "PXC_VERSION=${PXC_VERSION}" | sed 's/"//g' >> $GITHUB_ENV
4545
echo "PXC_VERSION_TAR=${PXC_VERSION}.1" | sed 's/"//g' >> $GITHUB_ENV
4646
echo "PXC_VERSION_PATH=${PXC_VERSION_PATH}" >> $GITHUB_ENV
47-
echo "PXC_VERSION_TRIMED=${PXC_VERSION_TRIMED}" >> $GITHUB_ENV
47+
echo "PXC_VERSION_TRIMED=${PXC_VERSION_TRIMED}" | sed 's/"//g' >> $GITHUB_ENV
4848
4949
- name: Concatenate values to environment file
5050
run: |
51-
echo "PXC_TARBALL_PATH=https://downloads.percona.com/downloads/TESTING/${{env.PXC_VERSION_PATH}}/Percona-XtraDB-Cluster_${{env.PXC_VERSION_TAR}}_Linux.x86_64.glibc${{env.PXC_GLIBC}}.tar.gz" >> $GITHUB_ENV
51+
echo "PXC_TARBALL_PATH=https://downloads.percona.com/downloads/TESTING/${{env.PXC_VERSION_TRIMED}}/Percona-XtraDB-Cluster_${{env.PXC_VERSION_TAR}}_Linux.x86_64.glibc${{env.PXC_GLIBC}}.tar.gz" >> $GITHUB_ENV
5252
echo "PMM_QA_REPO_URL=https://github.com/percona/pmm-qa/" >> $GITHUB_ENV
5353
echo "PMM_QA_REPO_BRANCH=main" >> $GITHUB_ENV
5454

.github/workflows/PMM_PS.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
- name: PS_VERSION ENV Setup
3434
run: |
35-
if [[ -n "${{ github.event.inputs.ps_version }}" ]]; then
35+
if [[ "${{ github.event.inputs.ps_version }}" != http* ]]; then
3636
PS_VERSION="${{ github.event.inputs.ps_version }}"
3737
PS_VERSION_PATH=$(echo "ps-$PS_VERSION")
3838
PS_VERSION_TRIMED=$(echo ${PS_VERSION%-*})

.github/workflows/PMM_PXC.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: PMM_PXC
1+
name: PMM_PXC
22
on:
33
workflow_dispatch:
44
inputs:
@@ -31,18 +31,18 @@ jobs:
3131

3232
- name: PXC_VERSION ENV Setup
3333
run: |
34-
if [[ -n "${{ github.event.inputs.pxc_version }}" ]]; then
34+
if [[ "${{ github.event.inputs.pxc_version }}" != http* ]]; then
3535
PXC_VERSION="${{ github.event.inputs.pxc_version }}"
3636
PXC_VERSION_PATH=$(echo "pxc-$PXC_VERSION")
3737
PXC_VERSION_TRIMED=$(echo ${PXC_VERSION%-*})
3838
else
3939
wget https://raw.githubusercontent.com/Percona-QA/package-testing/master/VERSIONS
4040
PXC_VERSION="$(grep 'PXC80_VER' VERSIONS | cut -d = -f 2)"
41-
PXC_VERSION_PATH=$(echo "pxc-$PXC_VERSION.1")
41+
PXC_VERSION_PATH=$(echo "pxc-$PXC_VERSION")
4242
PXC_VERSION_TRIMED=$(echo ${PXC_VERSION%-*})
4343
fi
4444
echo "PXC_VERSION=${PXC_VERSION}" | sed 's/"//g' >> $GITHUB_ENV
45-
echo "PXC_VERSION_TAR=${PXC_VERSION}.1" | sed 's/"//g' >> $GITHUB_ENV
45+
echo "PXC_VERSION_TAR=${PXC_VERSION}" | sed 's/"//g' >> $GITHUB_ENV
4646
echo "PXC_VERSION_PATH=${PXC_VERSION_PATH}" >> $GITHUB_ENV
4747
echo "PXC_VERSION_TRIMED=${PXC_VERSION_TRIMED}" >> $GITHUB_ENV
4848

0 commit comments

Comments
 (0)