Skip to content

MLE-30244 move Jenkins registry credentials to the publish stage and … #1951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RitaChen609 merged 4 commits into from
Jun 26, 2026
Merged

MLE-30244 move Jenkins registry credentials to the publish stage and … #1951

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd25628
MLE-30244 move Jenkins registry credentials to the publish stage and …
RitaChen609 Jun 24, 2026
cfef3bf
MLE-30244 refine the changes as the copilot reviews
RitaChen609 Jun 24, 2026
9a2f678
MLE-30244 update regex for image tags.
RitaChen609 Jun 24, 2026
21846c2
MLE-30244 tighten the regex for image tags
RitaChen609 Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,6 @@ pipeline {
environment {
JAVA_HOME_DIR = getJavaHomePath()
GRADLE_DIR = ".gradle"
DMC_USER = credentials('MLBUILD_USER')
DMC_PASSWORD = credentials('MLBUILD_PASSWORD')
PLATFORM = "linux/amd64"
MARKLOGIC_INSTALL_CONVERTERS = "true"
}
Expand Down Expand Up @@ -189,14 +187,19 @@ pipeline {
}
}
steps {
sh label: 'publish', script: '''#!/bin/bash
export JAVA_HOME=$JAVA_HOME_DIR
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
cp ~/.gradle/gradle.properties $GRADLE_USER_HOME;
cd java-client-api
./gradlew publish
'''
withCredentials([
string(credentialsId: 'MLBUILD_USER', variable: 'DMC_USER'),
string(credentialsId: 'MLBUILD_PASSWORD', variable: 'DMC_PASSWORD')
]) {
sh label: 'publish', script: '''#!/bin/bash
export JAVA_HOME=$JAVA_HOME_DIR
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
cp ~/.gradle/gradle.properties $GRADLE_USER_HOME;
cd java-client-api
./gradlew publish
'''
}
}
post {
always {
Expand Down Expand Up @@ -226,7 +229,14 @@ pipeline {

steps {
script {
def imageTags = params.MARKLOGIC_IMAGE_TAGS.split(',')
// Validate MARKLOGIC_IMAGE_TAGS to prevent argument injection via user-supplied image tag values;
// each entry is validated individually after trimming to reject empty values and tags
// containing spaces or other shell-injectable characters
def imageTags = params.MARKLOGIC_IMAGE_TAGS.split(',').collect { it.trim() }
def invalidTags = imageTags.findAll { it.isEmpty() || !(it ==~ /^[a-z0-9]+(?:[._-][a-z0-9]+)*(?::[A-Za-z0-9_][A-Za-z0-9_.-]{0,127})?$/) }
if (!invalidTags.isEmpty()) {
error("Invalid MARKLOGIC_IMAGE_TAGS entries: ${invalidTags}. Expected comma-delimited docker image refs like 'marklogic-server-ubi:latest-12'")
}
def imagePrefix = 'ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/'

imageTags.each { tag ->
Expand Down
Loading