Skip to content

MLE-25638 Fix notice file and increment Docker version for release #402

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 1 commit into from
Nov 26, 2025
Merged

MLE-25638 Fix notice file and increment Docker version for release #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -458,7 +458,7 @@ pipeline {

parameters {
string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
string(name: 'dockerVersion', defaultValue: '2.2.2', 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.3', description: 'ML Docker version. This version along with ML rpm package version will be the image tag as {ML_Version}_{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
2 changes: 1 addition & 1 deletion NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Apache License, Version 2.0, January 2004 (Apache-2.0)

Third-Party Components

The following is a list of third-party components used by MarkLogic Docker Container Image v2.1.0 (last updated October 18, 2024):
The following is a list of third-party components used by MarkLogic Docker Container Image v2 (last updated October 18, 2024):

RedHat UBI Docker Base Image 8
https://catalog.redhat.com/software/containers/ubi8/5c647760bed8bd28d0e38f9f?architecture=amd64&image=6643ab9ff6bc4ca6c09fb093&container-tabs=gti
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.2}
${UPGRADE_TEST_IMAGE} progressofficial/marklogic-db:11.3.1-ubi-rootless-2.2.2
${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
${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.2
${MARKLOGIC_DOCKER_VERSION} 2.2.3
${TEST_RESULTS_DIR} test_results

*** Keywords ***
Expand Down