PSMDB. Change job format and supported OS list for PSMDB PRO tarballs

Percona-Lab · Feb 3, 2025 · 9e4142c · 9e4142c
1 parent 0a042f3
commit 9e4142c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/psmdb/psmdb-fips.groovy b/psmdb/psmdb-fips.groovy
@@ -4,7 +4,7 @@ library changelog: false, identifier: "lib@master", retriever: modernSCM([
 ])
 
 def moleculeDir = "psmdb/psmdb"
-def fipsOS = ['rhel8-fips','rhel9','ubuntu-focal-pro','ubuntu-jammy-pro']
+def fipsOS = ['al2023','rhel8-fips','rhel9','ubuntu-focal-pro','ubuntu-jammy-pro','ubuntu-noble-pro']
 
 pipeline {
     agent {
@@ -33,8 +33,8 @@ pipeline {
             name: 'GATED_BUILD',
             description: 'Test private repo?',
             choices: [
-                'false',
-                'true'
+                'true',
+                'false'
             ]
         )
         string(

diff --git a/psmdb/psmdb-tarball-pro-functional.groovy b/psmdb/psmdb-tarball-pro-functional.groovy
@@ -4,8 +4,8 @@ library changelog: false, identifier: "lib@master", retriever: modernSCM([
 ])
 
 def moleculeDir = "psmdb-tarball/psmdb-tarball-pro"
-def psmdb_default_os_list = ["rhel8","rhel9","ubuntu-jammy-pro"]
-def psmdb_7_os_list = ["rhel8","rhel9","ubuntu-jammy-pro","debian-12"]
+def psmdb_default_os_list = ["al2023","rhel8","rhel9","ubuntu-jammy-pro","ubuntu-noble-pro"]
+def psmdb_7_os_list = ["al2023","rhel8","rhel9","ubuntu-jammy-pro","ubuntu-noble-pro","debian-12"]
 
 pipeline {
     agent {
@@ -17,9 +17,9 @@ pipeline {
     }
     parameters {
         string(
-            defaultValue: 'https://url_with_creds_if_needed.ol9.tar.gz',
-            description: 'URL/S3 link for pro tarball for ol9',
-            name: 'TARBALL_OL9'
+            defaultValue: '6.0.20-17',
+            description: 'PSMDB version for tests',
+            name: 'PSMDB_VERSION'
         )
         string(
             defaultValue: 'main',
@@ -35,12 +35,12 @@ pipeline {
             steps {
                 script {
                     currentBuild.displayName = "${env.BUILD_NUMBER}"
-                    currentBuild.description = "${env.TARBALL_OL9}"
+                    currentBuild.description = "${env.PSMDB_VERSION}"
 
-                    def versionNumber = TARBALL_OL9 =~ /percona-server-mongodb-pro-(\d+)/
+                    def versionNumber = PSMDB_VERSION =~ /^(\d+)/
                     def version = versionNumber ? Integer.parseInt(versionNumber[0][1]) : null
 
-                    if (version == 7) {
+                    if (version > 7) {
                         psmdb_default_os_list = psmdb_7_os_list
                     }
                 }
@@ -60,10 +60,14 @@ pipeline {
             }
         }
         stage('Test') {
-            steps {
+          steps {
+            withCredentials([usernamePassword(credentialsId: 'PSMDB_PRIVATE_REPO_ACCESS', passwordVariable: 'PASSWORD', usernameVariable: 'USERNAME')]) {
+             script {
                 moleculeParallelTest(psmdb_default_os_list, moleculeDir)
             }
+          }
         }
+      }
     }
     post {
         always {