Skip to content

MLE-26111 Increment Docker version for the release #420

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
vitalykorolev merged 3 commits into from
Feb 26, 2026
Merged

MLE-26111 Increment Docker version for the release #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bca142b
Increment Docker version for the release
vitalykorolev Feb 26, 2026
3a92193
Fix parameter description in Jenkinsfile
vitalykorolev Feb 26, 2026
5d90874
Replace hardcoded version in test/keywords.resource
vitalykorolev Feb 26, 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
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ pipeline {

parameters {
string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
string(name: 'dockerVersion', defaultValue: '2.2.3', description: 'ML Docker version. This version along with ML rpm package version will be the image tag as {ML_Version}_{dockerVersion}', trim: true)
string(name: 'dockerVersion', defaultValue: '2.2.4', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${dockerVersion}', trim: true)
choice(name: 'dockerImageType', choices: 'ubi-rootless\nubi\nubi9-rootless\nubi9', description: 'Platform type for Docker image. Will be made part of the docker image tag')
string(name: 'upgradeDockerImage', defaultValue: '', description: 'Docker image for testing upgrades. Defaults to ubi image if left blank.\n Currently upgrading to ubi-rotless is not supported hence the test is skipped when ubi-rootless image is provided.', trim: true)
choice(name: 'marklogicVersion', choices: '12\n11\n10', description: 'MarkLogic Server Branch. used to pick appropriate rpm')
Expand Down
6 changes: 3 additions & 3 deletions test/keywords.resource
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Library DateTime
${DEFAULT ADMIN USER} test_admin
${DEFAULT ADMIN PASS} test_admin_pass
${SPEC CHARS ADMIN PASS} Admin@2$s%^&*!
${TEST_IMAGE} %{DOCKER_TEST_IMAGE=progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.3}
${UPGRADE_TEST_IMAGE} progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.3
${TEST_IMAGE} %{DOCKER_TEST_IMAGE=progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.4}
${UPGRADE_TEST_IMAGE} progressofficial/marklogic-db:${MARKLOGIC_VERSION}-${IMAGE_TYPE}-${MARKLOGIC_DOCKER_VERSION}
${DOCKER TIMEOUT} 300s
${LICENSE KEY} %{QA_LICENSE_KEY=none}
${LICENSEE} MarkLogic - Version 9 QA Test License
Expand All @@ -22,7 +22,7 @@ ${BUILD_BRANCH} release_2.2.1
${IMAGE_TYPE} ubi-rootless
${VOL_NAME} MarkLogic_vol_1
${VOL_INFO} src=${VOL_NAME},dst=/var/opt/MarkLogic
${MARKLOGIC_DOCKER_VERSION} 2.2.3
${MARKLOGIC_DOCKER_VERSION} 2.2.4
${TEST_RESULTS_DIR} test_results

*** Keywords ***
Expand Down