Skip to content

Commit ca3bf77

Browse files
author
Peng Zhou
committed
get the latest Jenkinsfile from develop
1 parent 48fcdb0 commit ca3bf77

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

Jenkinsfile

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import groovy.json.JsonSlurperClassic
77

88
9-
gitCredID = '550650ab-ee92-4d31-a3f4-91a11d5388a3'
9+
gitCredID = 'marklogic-builder-github'
1010
JIRA_ID = ''
11-
JIRA_ID_PATTERN = /CLD-\d{3,4}/
11+
JIRA_ID_PATTERN = /(?i)(CLD|DEVO|QAINF|BUG|DBI)-\d{3,4}/
1212
LINT_OUTPUT = ''
1313
SCAN_OUTPUT = ''
1414
IMAGE_INFO = 0
@@ -31,7 +31,7 @@ void preBuildCheck() {
3131
if (env.CHANGE_ID) {
3232
if (prDraftCheck()) { sh 'exit 1' }
3333
if (getReviewState().equalsIgnoreCase('CHANGES_REQUESTED')) {
34-
println(reviewState)
34+
echo 'PR changes requested. (' + reviewState + ') Aborting.'
3535
sh 'exit 1'
3636
}
3737
}
@@ -51,11 +51,11 @@ def extractJiraID() {
5151
match = env.GIT_BRANCH =~ JIRA_ID_PATTERN
5252
}
5353
else {
54-
echo 'Warning: Jira ticket number not detected.'
54+
echo 'Warning: No Git title or branch available.'
5555
return ''
5656
}
5757
try {
58-
return match[0]
58+
return match[0][0]
5959
} catch (any) {
6060
echo 'Warning: Jira ticket number not detected.'
6161
return ''
@@ -131,7 +131,7 @@ void publishTestResults() {
131131
}
132132

133133
void pullImage() {
134-
withCredentials([usernamePassword(credentialsId: '8c2e0b38-9e97-4953-aa60-f2851bb70cc8', passwordVariable: 'docker_password', usernameVariable: 'docker_user')]) {
134+
withCredentials([usernamePassword(credentialsId: 'builder-credentials-artifactory', passwordVariable: 'docker_password', usernameVariable: 'docker_user')]) {
135135
sh """
136136
echo "\$docker_password" | docker login --username \$docker_user --password-stdin ${dockerRegistry}
137137
docker pull ${dockerRepository}:${dockerVersion}
@@ -167,8 +167,9 @@ pipeline {
167167
parameterizedCron( env.BRANCH_NAME == 'develop' ? '''00 04 * * *''' : '')
168168
}
169169
environment {
170-
timeStamp = sh(returnStdout: true, script: "date +%Y%m%d -d '-5 hours'").trim()
171-
dockerRegistry = 'ml-docker-dev.marklogic.com'
170+
//timeStamp = sh(returnStdout: true, script: "date +%Y%m%d -d '-5 hours'").trim()
171+
timeStamp = 'nightly'
172+
dockerRegistry = 'ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com'
172173
dockerRepository = "${dockerRegistry}/marklogic/marklogic-server-centos"
173174
dockerVerDivider = getVersionDiv(params.ML_VERSION)
174175
prevDockerVerDivider = getVersionDiv(params.PREV_ML_VERSION)
@@ -178,12 +179,12 @@ pipeline {
178179

179180
parameters {
180181
string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
181-
choice(name: 'ML_VERSION', choices: '11.1\n12.0\n10.0\n9.0', description: 'MarkLogic version. used to pick appropriate docker image')
182+
choice(name: 'ML_VERSION', choices: '11.2\n12.0\n10.0', description: 'MarkLogic version. used to pick appropriate docker image')
182183
booleanParam(name: 'KUBERNETES_TESTS', defaultValue: true, description: 'Run kubernetes tests')
183184
booleanParam(name: 'HC_TESTS', defaultValue: false, description: 'Run Hub Central E2E UI tests (takes about 3 hours)')
184-
string(name: 'dockerReleaseVer', defaultValue: '1.1.0', description: 'Current Docker version. (e.g. 1.0.1)', trim: true)
185-
choice(name: 'PREV_ML_VERSION', choices: '10.0\n9.0', description: 'Previous MarkLogic version for MarkLogic upgrade tests')
186-
string(name: 'prevDockerReleaseVer', defaultValue: '1.1.0', description: 'Previous Docker version for MarkLogic upgrade tests. (e.g. 1.0.1)', trim: true)
185+
string(name: 'dockerReleaseVer', defaultValue: '1.1.1', description: 'Current Docker version. (e.g. 1.0.1)', trim: true)
186+
choice(name: 'PREV_ML_VERSION', choices: '10.0\n9.0\n11.2', description: 'Previous MarkLogic version for MarkLogic upgrade tests')
187+
string(name: 'prevDockerReleaseVer', defaultValue: '1.1.1', description: 'Previous Docker version for MarkLogic upgrade tests. (e.g. 1.0.1)', trim: true)
187188
choice(name: 'K8_VERSION', choices: 'v1.25.8\nv1.26.3\nv1.24.12\nv1.23.17', description: 'Test Kubernetes version. (e.g. v1.25.8)')
188189
}
189190

@@ -212,8 +213,7 @@ pipeline {
212213
}
213214
steps {
214215
sh """
215-
export MINIKUBE_HOME=/space
216-
make test dockerImage=${dockerRepository}:${dockerVersion} prevDockerImage=${dockerRepository}:${prevDockerVersion} kubernetesVersion=${params.K8_VERSION} saveOutput=true
216+
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; make test dockerImage=${dockerRepository}:${dockerVersion} prevDockerImage=${dockerRepository}:${prevDockerVersion} kubernetesVersion=${params.K8_VERSION} saveOutput=true minikubeMemory=20gb
217217
"""
218218
}
219219
}
@@ -223,8 +223,7 @@ pipeline {
223223
}
224224
steps {
225225
sh """
226-
export MINIKUBE_HOME=/space;
227-
make hc-test dockerImage=${dockerRepository}:${dockerVersion} kubernetesVersion=${params.K8_VERSION}
226+
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; make hc-test dockerImage=${dockerRepository}:${dockerVersion} kubernetesVersion=${params.K8_VERSION} minikubeMemory=20gb
228227
"""
229228
}
230229
}
@@ -237,7 +236,7 @@ pipeline {
237236
docker system prune --force --filter "until=720h"
238237
docker volume prune --force
239238
docker image prune --force --all
240-
export MINIKUBE_HOME=/space; minikube delete --all --purge
239+
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; minikube delete --all --purge
241240
'''
242241
sh "rm -rf $WORKSPACE/test/test_results/"
243242
}
@@ -251,4 +250,4 @@ pipeline {
251250
resultNotification('BUILD UNSTABLE ❌')
252251
}
253252
}
254-
}
253+
}

0 commit comments

Comments
 (0)