diff --git a/proxysql/jenkins/proxysql-tarball.groovy b/proxysql/jenkins/proxysql-tarball.groovy index 925f37cef6..7e6874bd09 100644 --- a/proxysql/jenkins/proxysql-tarball.groovy +++ b/proxysql/jenkins/proxysql-tarball.groovy @@ -6,7 +6,7 @@ library changelog: false, identifier: "lib@master", retriever: modernSCM([ def operatingsystems() { - return ['ubuntu-noble','ubuntu-jammy','debian-11','debian-12','oracle-8','oracle-9'] + return ['ubuntu-noble','ubuntu-jammy','debian-11','debian-12','oracle-8','oracle-9','rhel-10'] } @@ -17,13 +17,13 @@ pipeline { environment { PATH = '/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/ec2-user/.local/bin'; MOLECULE_DIR = "molecule/proxysql-tarball/"; - PROXYSQL_VERSION = "${params.Proxysql_version}" + PROXYSQL_VERSION = "${params.PROXYSQL_VERSION}" WSREP_VERSION = "${params.WSREP_VERSION}" } parameters { string( - name: 'Proxysql_version', - defaultValue: '8.0.36-28', + name: 'PROXYSQL_VERSION', + defaultValue: '3.0.1-1.1', description: 'proxysql full version' ) string( @@ -45,7 +45,7 @@ pipeline { stage('Set build name'){ steps { script { - currentBuild.displayName = "${env.BUILD_NUMBER}-${env.Proxysql_version}" + currentBuild.displayName = "${env.BUILD_NUMBER}-${env.PROXYSQL_VERSION}" currentBuild.description = "${env.REVISION}-${env.TESTING_BRANCH}-${env.TESTING_GIT_ACCOUNT}" } } @@ -81,4 +81,4 @@ pipeline { } } } -} \ No newline at end of file +} diff --git a/ps/jenkins/test-ps-innodb-cluster-parallel.groovy b/ps/jenkins/test-ps-innodb-cluster-parallel.groovy index db0b08d775..73ca99ad58 100644 --- a/ps/jenkins/test-ps-innodb-cluster-parallel.groovy +++ b/ps/jenkins/test-ps-innodb-cluster-parallel.groovy @@ -13,8 +13,10 @@ List all_nodes = [ 'oracle-9', 'rhel-8', 'rhel-9', + 'rhel-10', 'rhel-8-arm', 'rhel-9-arm', + 'rhel-10-arm', 'debian-11-arm', 'debian-12-arm', 'ubuntu-focal-arm', @@ -68,8 +70,10 @@ pipeline { 'oracle-9', 'rhel-8', 'rhel-9', + 'rhel-10', 'rhel-8-arm', 'rhel-9-arm', + 'rhel-10-arm', 'debian-11-arm', 'debian-12-arm', 'ubuntu-focal-arm', @@ -363,6 +367,32 @@ pipeline { } } + + stage("Rhel-10") { + when { + expression { + TEST_DISTS.contains("rhel-10") + } + } + + steps { + runNodeBuild("rhel-10") + + } + } + + stage("Rhel-10-arm") { + when { + expression { + TEST_DISTS.contains("rhel-10-arm") + } + } + + steps { + runNodeBuild("rhel-10-arm") + + } + } } } } diff --git a/ps/jenkins/test-ps-innodb-cluster.groovy b/ps/jenkins/test-ps-innodb-cluster.groovy index 481835c8da..19ac07dc3e 100644 --- a/ps/jenkins/test-ps-innodb-cluster.groovy +++ b/ps/jenkins/test-ps-innodb-cluster.groovy @@ -183,8 +183,10 @@ pipeline { 'oracle-9', 'rhel-8', 'rhel-9', + 'rhel-10', 'rhel-8-arm', 'rhel-9-arm', + 'rhel-10-arm', 'debian-11-arm', 'debian-12-arm', 'ubuntu-focal-arm', diff --git a/ps/jenkins/test-ps80-binary-tarball-pro.groovy b/ps/jenkins/test-ps80-binary-tarball-pro.groovy index 27bd7ddbae..2a83c12311 100644 --- a/ps/jenkins/test-ps80-binary-tarball-pro.groovy +++ b/ps/jenkins/test-ps80-binary-tarball-pro.groovy @@ -6,7 +6,7 @@ library changelog: false, identifier: "lib@master", retriever: modernSCM([ def operatingsystems() { - return ['oracle-9','debian-12','ubuntu-jammy', 'ubuntu-noble', 'al-2023'] + return ['oracle-9','debian-12','ubuntu-jammy', 'ubuntu-noble', 'al-2023', 'rhel-10'] } diff --git a/vars/pdpsOperatingSystems.groovy b/vars/pdpsOperatingSystems.groovy index 64563e943e..e16708f1c7 100644 --- a/vars/pdpsOperatingSystems.groovy +++ b/vars/pdpsOperatingSystems.groovy @@ -1,3 +1,3 @@ def call() { - return ['oracle-8', 'oracle-9', 'rhel-8', 'rhel-9', 'debian-11', 'debian-12','ubuntu-focal', 'ubuntu-jammy', 'ubuntu-noble'] + return ['oracle-8', 'oracle-9', 'rhel-8', 'rhel-9', 'rhel-10', 'debian-11', 'debian-12','ubuntu-focal', 'ubuntu-jammy', 'ubuntu-noble'] } diff --git a/vars/ps80ProOperatingSystems.groovy b/vars/ps80ProOperatingSystems.groovy index edb1de9256..103df76d00 100644 --- a/vars/ps80ProOperatingSystems.groovy +++ b/vars/ps80ProOperatingSystems.groovy @@ -1,3 +1,3 @@ def call() { - return ['oracle-9', 'debian-12', 'ubuntu-jammy', 'ubuntu-noble', 'ubuntu-noble-arm', 'oracle-9-arm', 'debian-12-arm', 'ubuntu-jammy-arm', 'amazon-linux-2023', 'amazon-linux-2023-arm'] + return ['oracle-9', 'rhel-10', 'debian-12', 'ubuntu-jammy', 'ubuntu-noble', 'ubuntu-noble-arm', 'oracle-9-arm', 'rhel-10-arm', 'debian-12-arm', 'ubuntu-jammy-arm', 'amazon-linux-2023', 'amazon-linux-2023-arm'] } diff --git a/vars/psPackageTesting.groovy b/vars/psPackageTesting.groovy index 12a3baa128..4df1742495 100644 --- a/vars/psPackageTesting.groovy +++ b/vars/psPackageTesting.groovy @@ -1,4 +1,4 @@ def call() { - return ['debian-11','debian-11-arm' ,'debian-12','debian-12-arm' , 'oracle-8', 'oracle-9', 'rhel-9', 'rhel-8-arm', 'rhel-9-arm', 'ubuntu-jammy', 'ubuntu-jammy-arm', 'ubuntu-focal', 'ubuntu-focal-arm', 'ubuntu-noble', 'ubuntu-noble-arm'] + return ['debian-11','debian-11-arm' ,'debian-12','debian-12-arm' , 'oracle-8', 'oracle-9', 'rhel-9', 'rhel-10', 'rhel-8-arm', 'rhel-9-arm', 'rhel-10-arm', 'ubuntu-jammy', 'ubuntu-jammy-arm', 'ubuntu-focal', 'ubuntu-focal-arm', 'ubuntu-noble', 'ubuntu-noble-arm'] }