Skip to content

Commit eb49481

Browse files
Merge pull request #4257 from VarunNagaraju/PSQLADM-598
PSQLADM-598 Add support to run ProxySQL admin script tests with PXC 9.6
2 parents 5bcadf7 + 0b88d40 commit eb49481

2 files changed

Lines changed: 18 additions & 4 deletions

File tree

proxysql/qa-proxysql3-pipeline.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pipeline_timeout = 10
88
pipeline {
99
parameters {
1010
choice(
11-
choices: [ 'AWS','Hetzner' ],
11+
choices: [ 'Hetzner','AWS' ],
1212
description: 'Cloud infra for build',
1313
name: 'CLOUD' )
1414
string(
@@ -42,7 +42,7 @@ pipeline {
4242
name: 'PAT_TAG',
4343
trim: true)
4444
choice(
45-
choices: 'PXC84\nPXC80\nPXC57',
45+
choices: 'PXC96\nPXC84\nPXC80\nPXC57',
4646
description: 'PXC version to test proxysql-admin suite',
4747
name: 'PXC_VERSION')
4848
choice(

proxysql/test-proxysql

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# CMAKE_BUILD_TYPE = (RelWithDebInfo Debug)
77
# DEFAULT_TESTING = (yes no)
88
# QA_ARGS
9-
# PXC_VERSION = (PXC57 PXC80 PXC84)
9+
# PXC_VERSION = (PXC57 PXC80 PXC84 PXC96)
1010

1111
set -o errexit
1212
set -o xtrace
@@ -168,7 +168,21 @@ if [ -f /usr/bin/apt ]; then
168168
install_package wget gnupg2 lsb-release curl
169169
fi
170170

171-
if [[ "${PXC_VERSION}" == "PXC84" ]]; then
171+
if [[ "${PXC_VERSION}" == "PXC96" ]]; then
172+
# Fetch PXC versions
173+
LATEST_VERSION_96=$(git ls-remote --refs --sort='version:refname' --tags https://github.com/percona/percona-xtradb-cluster | \
174+
grep 'Percona-XtraDB-Cluster-9.6' | tail -n1 | cut -d '/' -f3 | cut -d '-' -f4)
175+
VERSION_SUFFIX_96=$(git ls-remote --refs --sort='version:refname' --tags https://github.com/percona/percona-xtradb-cluster | \
176+
grep 'Percona-XtraDB-Cluster-9.6' | tail -n1 | cut -d '/' -f3 | cut -d '-' -f5)
177+
178+
# Downloading PXC-9.6 tarball package
179+
sudo wget -q -O ${WORKDIR_ABS}/WORKDIR/Percona-XtraDB-Cluster_${LATEST_VERSION_96}_Linux.x86_64.glibc${glibc_version}-minimal.tar.gz\
180+
http://downloads.percona.com/downloads/TESTING/pxc-9.6.0/Percona-XtraDB-Cluster_9.6.0-1.1_Linux.x86_64.glibc2.35-minimal.tar.gz
181+
182+
# Installing PXC-9.6 client package
183+
enable_repo pxc-9x-innovation testing
184+
install_package percona-xtradb-cluster-client
185+
elif [[ "${PXC_VERSION}" == "PXC84" ]]; then
172186
# Fetch PXC versions
173187
LATEST_VERSION_84=$(git ls-remote --refs --sort='version:refname' --tags https://github.com/percona/percona-xtradb-cluster | \
174188
grep 'Percona-XtraDB-Cluster-8.4' | tail -n1 | cut -d '/' -f3 | cut -d '-' -f4)

0 commit comments

Comments
 (0)