diff --git a/Jenkinsfile b/Jenkinsfile index 622afa3..6199b7d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -504,9 +504,9 @@ pipeline { } parameters { - string(name: 'dockerVersion', defaultValue: '2.2.5', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${dockerVersion}', trim: true) + string(name: 'dockerVersion', defaultValue: '2.2.6', 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) + string(name: 'upgradeDockerImage', defaultValue: '', description: 'Docker image for testing upgrades. Defaults to ubi image if left blank.\n Currently upgrading to ubi-rootless is not supported hence the test is skipped when ubi-rootless image is provided.', trim: true) choice(name: 'marklogicVersion', choices: '12\n11', description: 'MarkLogic Server Branch. used to pick appropriate rpm') string(name: 'ML_RPM', defaultValue: '', description: 'URL for RPM to be used for Image creation. \n If left blank nightly ML rpm will be used.\n Please provide Jenkins accessible path e.g. /project/engineering or /project/qa', trim: true) string(name: 'ML_CONVERTERS', defaultValue: '', description: 'URL for the converters RPM to be included in the image creation \n If left blank the nightly ML Converters Package will be used.', trim: true) diff --git a/test/keywords.resource b/test/keywords.resource index fbdbbe7..b6366f7 100644 --- a/test/keywords.resource +++ b/test/keywords.resource @@ -12,17 +12,17 @@ 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.5} +${TEST_IMAGE} %{DOCKER_TEST_IMAGE=progressofficial/marklogic-db:11.3.6-ubi-rootless-2.2.6} ${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 -${MARKLOGIC_VERSION} 11.3.1 -${BUILD_BRANCH} release_2.2.1 +${MARKLOGIC_VERSION} 11.3.6 +${BUILD_BRANCH} release_2.2.6 ${IMAGE_TYPE} ubi-rootless ${VOL_NAME} MarkLogic_vol_1 ${VOL_INFO} src=${VOL_NAME},dst=/var/opt/MarkLogic -${MARKLOGIC_DOCKER_VERSION} 2.2.5 +${MARKLOGIC_DOCKER_VERSION} 2.2.6 ${TEST_RESULTS_DIR} test_results *** Keywords ***