Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Updates fix defaults for GH #107

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
5 changes: 3 additions & 2 deletions .github/workflows/PMM_PROXYSQL.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ on:
inputs:
pxc_version:
description: "pxc version, example: 8.0.33-25 Fetched from https://github.com/Percona-QA/package-testing/blob/master/VERSIONS by default"
required: false
required: true
pxc_glibc:
description: "pxc glibc version, example: 2.35"
required: true
required: false
pmm_image:
description: "pmm_image, example: perconalab/pmm-server:dev-latest"
required: false
Expand All @@ -26,6 +26,7 @@ jobs:
env:
PXC_GLIBC: ${{ github.event.inputs.pxc_glibc || '2.35' }}
PMM_IMAGE: ${{ github.event.inputs.pmm_image || 'perconalab/pmm-server:dev-latest' }}
PXC_VERSION: ${{ github.event.inputs.pxc_version || '8.0.33' }}
steps:
- uses: actions/checkout@v2

Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/PMM_PS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ on:
inputs:
ps_version:
description: "ps version example: 8.0.34-26 , Fetched from https://github.com/Percona-QA/package-testing/blob/master/VERSIONS by default"
default: 'https://github.com/Percona-QA/package-testing/blob/master/VERSIONS'
required: true
ps_glibc:
description: "ps glibc version, example: 2.28"
description: "ps glibc version, example: 2.35"
default : '2.35'
required: false
pmm_image:
description: "pmm_image, example: perconalab/pmm-server:dev-latest"
default : 'perconalab/pmm-server:dev-latest'
required: false
push:
branches:
Expand All @@ -24,16 +27,15 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 20
env:
PS_GLIBC: ${{ github.event.inputs.ps_glibc || '2.28' }}
PS_GLIBC: ${{ github.event.inputs.ps_glibc || '2.35' }}
PMM_IMAGE: ${{ github.event.inputs.pmm_image || 'perconalab/pmm-server:dev-latest' }}

PS_VERSION: ${{ github.event.inputs.ps_version || 'https://raw.githubusercontent.com/Percona-QA/package-testing/master/VERSIONS' }}
steps:
- uses: actions/checkout@v2

- name: PS_VERSION ENV Setup
run: |
if [[ "${{ github.event.inputs.ps_version }}" != http* ]]; then
PS_VERSION="${{ github.event.inputs.ps_version }}"
if [[ "$PS_VERSION" != http* ]]; then
PS_VERSION_PATH=$(echo "ps-$PS_VERSION")
PS_VERSION_TRIMED=$(echo ${PS_VERSION%-*})
else
Expand All @@ -43,7 +45,7 @@ jobs:
PS_VERSION_TRIMED=$(echo ${PS_VERSION_FULL%-*})
fi
echo "PS_VERSION=${PS_VERSION}" | sed 's/"//g' >> $GITHUB_ENV
echo "PS_VERSION_PATH=${PS_VERSION_PATH}" >> $GITHUB_ENV
echo "PS_VERSION_PATH=${PS_VERSION_PATH}" | sed 's/"//g' >> $GITHUB_ENV
echo "PS_VERSION_TRIMED=${PS_VERSION_TRIMED}" >> $GITHUB_ENV


Expand Down Expand Up @@ -85,7 +87,12 @@ 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 }} --setup-pmm-ps-integration --pmm2 --ps-tarball ${{ env.PS_TARBALL_PATH }} --query-source=slowlog
run: |
if [[ "${{ env.PS_VERSION }}" != http* ]]; then
./pmm-framework.sh --ps-version ${{ env.PS_VERSION }} --setup-pmm-ps-integration --pmm2 --query-source=perfschema
else
./pmm-framework.sh --ps-version ${{ env.PS_VERSION }} --setup-pmm-ps-integration --pmm2 --ps-tarball ${{ env.PS_TARBALL_PATH }} --query-source=perfschema
fi
working-directory: pmm-qa/pmm-tests

- name: Checkout the repo and install node packages
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/PMM_PXC.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ on:
inputs:
pxc_version:
description: "pxc version, example: 8.0.33-25 Fetched from https://github.com/Percona-QA/package-testing/blob/master/VERSIONS by default"
required: false
required: true
pxc_glibc:
description: "pxc glibc version, example: 2.35"
required: true
required: false
pmm_image:
description: "pmm_image, example: perconalab/pmm-server:dev-latest"
required: false
Expand All @@ -26,6 +26,7 @@ jobs:
env:
PXC_GLIBC: ${{ github.event.inputs.pxc_glibc || '2.35' }}
PMM_IMAGE: ${{ github.event.inputs.pmm_image || 'perconalab/pmm-server:dev-latest' }}
PXC_VERSION: ${{ github.event.inputs.pxc_version || '8.0.33' }}
steps:
- uses: actions/checkout@v2

Expand Down Expand Up @@ -84,7 +85,13 @@ jobs:
run: sudo pmm-admin config --server-insecure-tls --server-url=https://admin:admin@localhost:443

- name: Run for PXC tests
run: ./pmm-framework.sh --pxc-version ${{ env.PXC_VERSION }} --addclient=pxc,1 --pmm2 --pxc-tarball ${{ env.PXC_TARBALL_PATH }}
run: |
if [[ "${{ github.event.inputs.pxc_version }}" != http* ]]; then
./pmm-framework.sh --pxc-version ${{ env.PXC_VERSION }} --addclient=pxc,1 --pmm2

else
./pmm-framework.sh --pxc-version ${{ env.PXC_VERSION }} --addclient=pxc,1 --pmm2 --pxc-tarball ${{ env.PXC_TARBALL_PATH }}
fi
working-directory: pmm-qa/pmm-tests

- name: Checkout the repo and install node packages
Expand Down
Loading