Skip to content
Merged
1 change: 1 addition & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ void structureTests() {
* Runs Docker functional tests using the 'make docker-tests' target.
*/
void dockerTests() {
sh "make docker-test-ids"
sh "make docker-tests current_image=marklogic/marklogic-server-${dockerImageType}:${marklogicVersion}-${env.dockerImageType}-${env.dockerVersion} upgrade_image=${upgradeDockerImage} marklogicVersion=${marklogicVersion} build_branch=${env.BRANCH_NAME} dockerVersion=${env.dockerVersion} docker_image_type=${dockerImageType} DOCKER_TEST_LIST=\"${params.DOCKER_TEST_LIST}\""
}

Expand Down
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,14 @@ endif
#***************************************************************************
# docker image tests
#***************************************************************************
.PHONY: docker-test-ids
docker-test-ids:
@echo "Docker test ID catalog (Robot test names):"
@awk 'BEGIN{in_tests=0} /^\*\*\* Test Cases \*\*\*/{in_tests=1;next} /^\*\*\*/{if(in_tests)exit} in_tests && /^[DC][0-9][0-9] /{print " - " $$0}' ./test/docker-tests.robot

docker-tests:
cd test; \
$(MAKE) -s docker-test-ids; \
python3 -m venv python_env; \
source ./python_env/bin/activate; \
pip3 install -r requirements.txt; \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright © 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Copyright © 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Compose scenario: Single bootstrap node with admin credentials from environment variables.
version: '3.6'
services:
bootstrap_3n:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
#Docker compose file sample to setup a one node cluster
# Copyright © 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Compose scenario: Single node configured to join itself to validate self-join handling.
version: '3.6'
services:
bootstrap:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
#Docker compose file to setup the bootstrap node on cluster
# Copyright © 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Compose scenario: Bootstrap-only node used as base for follow-up join tests.
version: '3.6'
services:
bootstrap_2n:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
#Docker compose file sample to setup a three node cluster
# Copyright © 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Compose scenario: Two-node cluster using admin credentials from environment variables.
version: '3.6'
services:
bootstrap:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
#Docker compose file sample to setup a two node cluster
# Copyright © 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Compose scenario: Two-node deployment with an invalid bootstrap host name for node2.
version: '3.6'
services:
bootstrap:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
#Docker compose file to setup and join node2 on cluster using MARKLOGIC_GROUP param
# Copyright © 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Compose scenario: Second node joins bootstrap and is assigned to the enode group using secrets.
version: '3.6'
services:
node2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright © 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Copyright © 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Compose scenario: HTTPS join with invalid MARKLOGIC_JOIN_TLS_ENABLED value.
version: '3.6'
services:
node2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright © 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Copyright © 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Compose scenario: HTTPS join with missing MARKLOGIC_JOIN_CACERT_FILE value.
version: '3.6'
services:
node3:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright © 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Copyright © 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Compose scenario: Second node joins bootstrap over HTTPS using username/password/CA secrets.
version: '3.6'
services:
node2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
#Docker compose file sample to setup a three node cluster
# Copyright © 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Compose scenario: Two-node deployment where second node is initialized but does not join the cluster.
version: '3.6'
services:
testbootstrap:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
#Docker compose file sample to setup a three node cluster
# Copyright © 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Compose scenario: Two-node deployment where second node remains uninitialized.
version: '3.6'
services:
testbootstrap:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Docker compose file to setup two separate 2-node clusters for coupling test
# Compose scenario: Two separate 2-node clusters with secrets for cross-cluster coupling tests.
version: '3.6'
services:
# === CLUSTER 1 ===
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright © 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
#Docker compose file sample to setup a three node cluster
# Copyright © 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
# Compose scenario: Dynamic host test topology with 3 core nodes and 11 dynamic nodes.
version: '3.6'
services:
bootstrap_3n:
Expand Down
25 changes: 0 additions & 25 deletions test/compose-test-12.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions test/compose-test-14.yaml

This file was deleted.

42 changes: 0 additions & 42 deletions test/compose-test-15.yaml

This file was deleted.

42 changes: 0 additions & 42 deletions test/compose-test-2.yaml

This file was deleted.

Loading
Loading