Geode: Updates to make builds more stable

Change-Id: Id6be87daa0a795831a83efdb4bb52975e953733e

diff --git a/jjb/geode/apache-geode-test/apache-geode-integration-test.yaml b/jjb/geode/apache-geode-test/apache-geode-integration-test.yaml
index 45b3d6b54d08b9e083c02d33e28ae40436ff31d5..173d71eb3f787dcecaea35f35511f77d290c2518 100644 (file)
--- a/jjb/geode/apache-geode-test/apache-geode-integration-test.yaml
+++ b/jjb/geode/apache-geode-test/apache-geode-integration-test.yaml
@@ -29,7 +29,7 @@
     java-test-version: '11'
     parallel-gradle: 'true'
     parallel-dunit: 'true'
-    dunit-parallel-forks: '12'
+    dunit-parallel-forks: '8'
 
     jobs:
       - 'apache-geode-{test-type}Test-jdk{java-test-version}'

diff --git a/jjb/geode/apache-geode-test/apache-geode-stressnew-test.yaml b/jjb/geode/apache-geode-test/apache-geode-stressnew-test.yaml
index 9be315edcbefe5f04895b7f3bb38b37bfd1e0626..77b6084280719a00c5b147c75d2e20a0d3d77293 100644 (file)
--- a/jjb/geode/apache-geode-test/apache-geode-stressnew-test.yaml
+++ b/jjb/geode/apache-geode-test/apache-geode-stressnew-test.yaml
@@ -29,7 +29,7 @@
     java-test-version: '11'
     parallel-gradle: 'false'
     parallel-dunit: 'true'
-    dunit-parallel-forks: '12'
+    dunit-parallel-forks: '8'
 
     jobs:
       - 'apache-geode-{test-type}Test-jdk{java-test-version}'

diff --git a/jjb/geode/apache-geode-test/apache-geode-upgrade-test.yaml b/jjb/geode/apache-geode-test/apache-geode-upgrade-test.yaml
index f81df4bad8f1681ee4906c4249afe12f752f823b..8f9fd38f41e1f6c884b5aac89f4e29cd2dc6f89e 100644 (file)
--- a/jjb/geode/apache-geode-test/apache-geode-upgrade-test.yaml
+++ b/jjb/geode/apache-geode-test/apache-geode-upgrade-test.yaml
@@ -29,7 +29,7 @@
     java-test-version: '11'
     parallel-gradle: 'true'
     parallel-dunit: 'true'
-    dunit-parallel-forks: '12'
+    dunit-parallel-forks: '8'
 
     jobs:
       - 'apache-geode-{test-type}Test-jdk{java-test-version}'

diff --git a/jjb/geode/apache-geode-test/execute_stressnew.sh b/jjb/geode/apache-geode-test/execute_stressnew.sh
index 2f7b179db38bb3d7b0de47625a63d35a48a4f147..5b452fb051fd8414928f716e75ee47982516ee6f 100755 (executable)
--- a/jjb/geode/apache-geode-test/execute_stressnew.sh
+++ b/jjb/geode/apache-geode-test/execute_stressnew.sh
@@ -156,4 +156,9 @@ EXEC_COMMAND="bash -c 'echo Building with: $SEP \
   sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.bak gradlewStrict $SEP \
   GRADLE_JVM=${JAVA_BUILD_PATH} ./gradlewStrict ${GRADLE_ARGS}'"
 echo "${EXEC_COMMAND}"
-eval "${EXEC_COMMAND}"
\ No newline at end of file
+eval "${EXEC_COMMAND}"
+
+# Cleanup
+# Make sure all test containers are stopped and removed when tests are finished
+docker stop $(docker ps -a -q)
+docker rm $(docker ps -a -q)
\ No newline at end of file

diff --git a/jjb/geode/apache-geode-test/execute_tests.sh b/jjb/geode/apache-geode-test/execute_tests.sh
index d0371d291208a5a5a83ab3b46897eaffeb23028b..37231ecd11049c5f12d913e1ce2074b32b69f053 100755 (executable)
--- a/jjb/geode/apache-geode-test/execute_tests.sh
+++ b/jjb/geode/apache-geode-test/execute_tests.sh
@@ -90,3 +90,8 @@ EXEC_COMMAND="bash -c 'echo Building with: $SEP \
   GRADLE_JVM=${JAVA_BUILD_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 stop $(docker ps -a -q)
+docker rm $(docker ps -a -q)
\ No newline at end of file

diff --git a/jjb/geode/global-template-apache-geode-test.yaml b/jjb/geode/global-template-apache-geode-test.yaml
index 1acb6cc7f7ec9578000731cbe9768c676fe3f9f1..d84c77ff809192259624fbe48c3828995db4c4fd 100644 (file)
--- a/jjb/geode/global-template-apache-geode-test.yaml
+++ b/jjb/geode/global-template-apache-geode-test.yaml
@@ -78,6 +78,11 @@
     builders:
       - '{build-executor}'
 
+    publishers:
+      - workspace-cleanup:
+          clean-if:
+            - failure: false
+
 #    publishers:
 #      - notify-slack:
 #          slack-channel: '#geode'