Skip to content

Commit 43fc01e

Browse files
PSMDB. Change job format and supported OS list for PSMDB PRO tarballs (#3133)
1 parent c7a4b92 commit 43fc01e

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

psmdb/psmdb-fips.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ library changelog: false, identifier: "lib@master", retriever: modernSCM([
44
])
55

66
def moleculeDir = "psmdb/psmdb"
7-
def fipsOS = ['rhel8-fips','rhel9','ubuntu-focal-pro','ubuntu-jammy-pro']
7+
def fipsOS = ['al2023','rhel8-fips','rhel9','ubuntu-focal-pro','ubuntu-jammy-pro']
88

99
pipeline {
1010
agent {
@@ -33,8 +33,8 @@ pipeline {
3333
name: 'GATED_BUILD',
3434
description: 'Test private repo?',
3535
choices: [
36-
'false',
37-
'true'
36+
'true',
37+
'false'
3838
]
3939
)
4040
string(

psmdb/psmdb-tarball-pro-functional.groovy

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ library changelog: false, identifier: "lib@master", retriever: modernSCM([
44
])
55

66
def moleculeDir = "psmdb-tarball/psmdb-tarball-pro"
7-
def psmdb_default_os_list = ["rhel8","rhel9","ubuntu-jammy-pro"]
8-
def psmdb_7_os_list = ["rhel8","rhel9","ubuntu-jammy-pro","debian-12"]
7+
def psmdb_default_os_list = ["al2023","rhel8","rhel9","ubuntu-jammy-pro","ubuntu-noble-pro"]
8+
def psmdb_7_os_list = ["al2023","rhel8","rhel9","ubuntu-jammy-pro","ubuntu-noble-pro","debian-12"]
99

1010
pipeline {
1111
agent {
@@ -17,9 +17,9 @@ pipeline {
1717
}
1818
parameters {
1919
string(
20-
defaultValue: 'https://url_with_creds_if_needed.ol9.tar.gz',
21-
description: 'URL/S3 link for pro tarball for ol9',
22-
name: 'TARBALL_OL9'
20+
defaultValue: '6.0.20-17',
21+
description: 'PSMDB version for tests',
22+
name: 'PSMDB_VERSION'
2323
)
2424
string(
2525
defaultValue: 'main',
@@ -35,12 +35,12 @@ pipeline {
3535
steps {
3636
script {
3737
currentBuild.displayName = "${env.BUILD_NUMBER}"
38-
currentBuild.description = "${env.TARBALL_OL9}"
38+
currentBuild.description = "${env.PSMDB_VERSION}"
3939

40-
def versionNumber = TARBALL_OL9 =~ /percona-server-mongodb-pro-(\d+)/
40+
def versionNumber = PSMDB_VERSION =~ /^(\d+)/
4141
def version = versionNumber ? Integer.parseInt(versionNumber[0][1]) : null
4242

43-
if (version == 7) {
43+
if (version > 7) {
4444
psmdb_default_os_list = psmdb_7_os_list
4545
}
4646
}
@@ -60,10 +60,14 @@ pipeline {
6060
}
6161
}
6262
stage('Test') {
63-
steps {
63+
steps {
64+
withCredentials([usernamePassword(credentialsId: 'PSMDB_PRIVATE_REPO_ACCESS', passwordVariable: 'PASSWORD', usernameVariable: 'USERNAME')]) {
65+
script {
6466
moleculeParallelTest(psmdb_default_os_list, moleculeDir)
6567
}
68+
}
6669
}
70+
}
6771
}
6872
post {
6973
always {

0 commit comments

Comments
 (0)