Skip to content

Commit cf8a1c7

Browse files
author
Vitaly Korolev
committed
Increment Docker version
1 parent 0e7c53d commit cf8a1c7

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ pipeline {
569569
}
570570

571571
parameters {
572-
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)
572+
string(name: 'dockerVersion', defaultValue: '2.3.0', description: 'ML Docker version. This value is used as part of the Docker image tag, which is built as ${marklogicVersion}-${dockerImageType}-${dockerVersion}', trim: true)
573573
choice(name: 'dockerImageType', choices: 'ubi-rootless\nubi\nubi9-rootless\nubi9\nubi9-arm\nubi9-rootless-arm', description: 'Platform type for Docker image. Will be made part of the docker image tag')
574574
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)
575575
choice(name: 'marklogicVersion', choices: '12\n11', description: 'MarkLogic Server Branch. used to pick appropriate rpm')

test/keywords.resource

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ ${DOCKER_PLATFORM} %{DOCKER_PLATFORM=linux/amd64}
1313
${DEFAULT ADMIN USER} test_admin
1414
${DEFAULT ADMIN PASS} test_admin_pass
1515
${SPEC CHARS ADMIN PASS} Admin@2$s%^&*!
16-
${TEST_IMAGE} %{DOCKER_TEST_IMAGE=progressofficial/marklogic-db:11.3.6-ubi-rootless-2.2.6}
16+
${TEST_IMAGE} %{DOCKER_TEST_IMAGE=progressofficial/marklogic-db:11.3.7-ubi-rootless-2.3.0}
1717
${UPGRADE_TEST_IMAGE} progressofficial/marklogic-db:${MARKLOGIC_VERSION}-${IMAGE_TYPE}-${MARKLOGIC_DOCKER_VERSION}
1818
${DOCKER TIMEOUT} 300s
1919
${LICENSE KEY} %{QA_LICENSE_KEY=none}
2020
${LICENSEE} MarkLogic - Version 9 QA Test License
21-
${MARKLOGIC_VERSION} 11.3.6
22-
${BUILD_BRANCH} release_2.2.6
21+
${MARKLOGIC_VERSION} 11.3.7
22+
${BUILD_BRANCH} release_2.3.0
2323
${IMAGE_TYPE} ubi-rootless
2424
${VOL_NAME} MarkLogic_vol_1
2525
${VOL_INFO} src=${VOL_NAME},dst=/var/opt/MarkLogic
26-
${MARKLOGIC_DOCKER_VERSION} 2.2.6
26+
${MARKLOGIC_DOCKER_VERSION} 2.3.0
2727
${TEST_RESULTS_DIR} test_results
2828

2929
*** Keywords ***

0 commit comments

Comments
 (0)