Skip to content

Commit b63620e

Browse files
Merge pull request #321 from vitalykorolev/MLE-18005_disable-ubi9-on-12
MLE-18005 disable ubi9 on 12
2 parents 3d0f030 + 3f017c7 commit b63620e

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

Jenkinsfile

+3-5
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ void vulnerabilityScan() {
266266
void publishToInternalRegistry() {
267267
withCredentials([usernamePassword(credentialsId: 'builder-credentials-artifactory', passwordVariable: 'docker_password', usernameVariable: 'docker_user')]) {
268268
sh """
269+
docker logout ${dockerRegistry}
269270
echo "${docker_password}" | docker login --username ${docker_user} --password-stdin ${dockerRegistry}
270271
docker tag ${builtImage} ${dockerRegistry}/${builtImage}
271272
docker tag ${builtImage} ${dockerRegistry}/${publishImage}
@@ -345,9 +346,7 @@ pipeline {
345346
30 02 * * * % marklogicVersion=12;dockerImageType=ubi
346347
30 02 * * * % marklogicVersion=12;dockerImageType=ubi-rootless;SCAP_SCAN=true
347348
00 03 * * * % marklogicVersion=11;dockerImageType=ubi9
348-
00 03 * * * % marklogicVersion=11;dockerImageType=ubi9-rootless;SCAP_SCAN=true
349-
00 03 * * * % marklogicVersion=12;dockerImageType=ubi9
350-
00 03 * * * % marklogicVersion=12;dockerImageType=ubi9-rootless;SCAP_SCAN=true''' : '')
349+
00 03 * * * % marklogicVersion=11;dockerImageType=ubi9-rootless;SCAP_SCAN=true''' : '')
351350
}
352351
environment {
353352
QA_LICENSE_KEY = credentials('QA_LICENSE_KEY')
@@ -452,8 +451,7 @@ pipeline {
452451
cd src
453452
rm -rf *.rpm NOTICE.txt
454453
docker stop $(docker ps -a -q) || true
455-
docker system prune --force --all
456-
docker volume prune --force --all
454+
docker system prune --force --all --volumes
457455
docker system df
458456
'''
459457
publishTestResults()

0 commit comments

Comments
 (0)