diff --git a/Jenkinsfile b/Jenkinsfile index 404b21d..7bdfaa0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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') diff --git a/NOTICE.txt b/NOTICE.txt index e440874..116953d 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -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 diff --git a/test/keywords.resource b/test/keywords.resource index 0d12eaf..bfd6c14 100644 --- a/test/keywords.resource +++ b/test/keywords.resource @@ -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 @@ -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 ***