project: 'Nordix/geode'
stream:
+ - 'release-nordix-1.15.1':
+ branch: 'release-nordix/1.15.1'
+ test_using_docker: false
- 'release-nordix-1.14.0':
branch: 'release-nordix/1.14.0'
+ test_using_docker: true
jobs:
- 'apache-geode-verify-{stream}-coordinator'
name: PUBLISH_GEODE
default: true
description: Publish Geode software to Nordix Artifactory after all tests are passed
+ - bool:
+ name: TEST_USING_DOCKER
+ default: '{test_using_docker}'
+ description: Geode versions prior to 1.15 were using a docker for executing parallel testing. Please set it to 'no' when building version 1.15 onwards.
properties:
- logrotate
if [[ -n "${PARALLEL_DUNIT}" && "${PARALLEL_DUNIT}" == "true" ]]; then
PARALLEL_DUNIT="-PparallelDunit"
- if [ -n "${DUNIT_PARALLEL_FORKS}" ]; then
+ if [[ -n "${DUNIT_PARALLEL_FORKS}" && "${TEST_USING_DOCKER}" == "false" ]] ; then
DUNIT_PARALLEL_FORKS="--max-workers=${DUNIT_PARALLEL_FORKS} -PtestMaxParallelForks=${DUNIT_PARALLEL_FORKS} -PdunitParallelForks=${DUNIT_PARALLEL_FORKS}"
+ elif [[ -n "${DUNIT_PARALLEL_FORKS}" && "${TEST_USING_DOCKER}" == "true" ]] ; then
+ DUNIT_PARALLEL_FORKS="-PdunitParallelForks=${DUNIT_PARALLEL_FORKS}"
+ DOCKER_TESTING_OPTIONS="-PdunitDockerUser=geode -PdunitDockerImage=\$(docker images --format '{{.Repository}}:{{.Tag}}' | grep test-container)"
fi
else
PARALLEL_DUNIT=""
DUNIT_PARALLEL_FORKS=""
+ DOCKER_TESTING_OPTIONS=""
fi
case $ARTIFACT_SLUG in
-PtestJava17Home=${TEST_JAVA_17_HOME} \
${PARALLEL_DUNIT} \
${DUNIT_PARALLEL_FORKS} \
+ ${DOCKER_TESTING_OPTIONS} \
${DEFAULT_GRADLE_TASK_OPTIONS} \
${GRADLE_SKIP_TASK_OPTIONS} \
${GRADLE_TASK} \
echo "${EXEC_COMMAND}"
eval "${EXEC_COMMAND}"
+# Cleanup
+# Make sure all test containers are stopped and removed when tests are finished
+DOCKER_CONTAINERS=$(sudo docker ps -a -q 2> /dev/null)
+if [ -n "${DOCKER_CONTAINERS}" ]; then
+ docker stop ${DOCKER_CONTAINERS} > /dev/null
+ echo -e "Removing containers with ID:"
+ docker rm ${DOCKER_CONTAINERS}
+fi
if [[ -n "${PARALLEL_DUNIT}" && "${PARALLEL_DUNIT}" == "true" ]]; then
PARALLEL_DUNIT="-PparallelDunit"
- if [ -n "${DUNIT_PARALLEL_FORKS}" ]; then
+ if [[ -n "${DUNIT_PARALLEL_FORKS}" && "${TEST_USING_DOCKER}" == "false" ]] ; then
DUNIT_PARALLEL_FORKS="--max-workers=${DUNIT_PARALLEL_FORKS} -PtestMaxParallelForks=${DUNIT_PARALLEL_FORKS} -PdunitParallelForks=${DUNIT_PARALLEL_FORKS}"
+ elif [[ -n "${DUNIT_PARALLEL_FORKS}" && "${TEST_USING_DOCKER}" == "true" ]] ; then
+ DUNIT_PARALLEL_FORKS="-PdunitParallelForks=${DUNIT_PARALLEL_FORKS}"
+ DOCKER_TESTING_OPTIONS="-PdunitDockerUser=geode -PdunitDockerImage=\$(docker images --format '{{.Repository}}:{{.Tag}}' | grep test-container)"
fi
else
PARALLEL_DUNIT=""
DUNIT_PARALLEL_FORKS=""
+ DOCKER_TESTING_OPTIONS=""
fi
case $ARTIFACT_SLUG in
-PtestJava17Home=${TEST_JAVA_17_HOME} \
${PARALLEL_DUNIT} \
${DUNIT_PARALLEL_FORKS} \
+ ${DOCKER_TESTING_OPTIONS} \
${DEFAULT_GRADLE_TASK_OPTIONS} \
${GRADLE_SKIP_TASK_OPTIONS} \
${GRADLE_TASK} \
cp gradlew gradlewStrict $SEP \
sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.bak gradlewStrict $SEP \
GRADLE_JVM=${JAVA_BUILD_PATH} JAVA_TEST_PATH=${JAVA_TEST_PATH} ./gradlewStrict ${GRADLE_ARGS}'"
-
echo "${EXEC_COMMAND}"
eval "${EXEC_COMMAND}"
+
+# Cleanup
+# Make sure all test containers are stopped and removed when tests are finished
+DOCKER_CONTAINERS=$(sudo docker ps -a -q 2> /dev/null)
+if [ -n "${DOCKER_CONTAINERS}" ]; then
+ docker stop ${DOCKER_CONTAINERS} > /dev/null
+ echo -e "Removing containers with ID:"
+ docker rm ${DOCKER_CONTAINERS}
+fi
+
name: TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX
default: 'registry.nordix.org/docker-hub-proxy/'
description: 'Docker Hub proxy location for geode test containers required for AcceptanceTest'
+ - bool:
+ name: TEST_USING_DOCKER
+ default: false
+ description: Geode versions prior to 1.15 were using a docker for executing parallel testing. Please set it to 'no' when building version 1.15 onwards.
scm:
- git-scm-github: