Merge "Remove TARGET_NODE_OS variable"

diff --git a/jjb/geode-native/apache-geode-native-test/integrationtest.sh b/jjb/geode-native/apache-geode-native-test/integrationtest.sh
index d6691c5969e329065ef97e1831f0800e1686d898..f4ed1153b4b80347b346322f310ffab4a32cd874 100755 (executable)
--- a/jjb/geode-native/apache-geode-native-test/integrationtest.sh
+++ b/jjb/geode-native/apache-geode-native-test/integrationtest.sh
@@ -24,10 +24,16 @@ set -o pipefail
 GEODE_NATIVE_DIR="${WORKSPACE}/geode-native"
 SOURCE_DIR="/geode-native"
 
-DOCKER_ARGS="--rm --volume=${GEODE_NATIVE_DIR}:${SOURCE_DIR}"
+CTEST_TIMEOUT=2000
+CTEST_JOBS=$(( $(nproc) / 4 ))
+CTEST_ARGS="--output-on-failure --repeat until-pass:4 --schedule-random"
+
+DOCKER_ARGS="--rm --volume=${GEODE_NATIVE_DIR}:${SOURCE_DIR}\
+  -e LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libSegFault.so"
 COMMAND="echo -e '\n*** Build ***\n' && mkdir build && cd build &&\
   cmake ${SOURCE_DIR} -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_CXX_CLANG_TIDY=clang-tidy &&\
   cmake --build . -- -j${JOBS} && echo -e '\n*** Old Integration Tests ***\n' &&\
-  cd /build/cppcache/integration-test && ctest --timeout 2000 -L STABLE -C Release -j1"
+  cd /build/cppcache/integration-test &&\
+  ctest -L STABLE -C Release -j${CTEST_JOBS} --timeout ${CTEST_TIMEOUT} ${CTEST_ARGS}"
 
 docker run ${DOCKER_ARGS} "${GEODE_NATIVE_DOCKER_IMAGE}" bash -c "${COMMAND}"

diff --git a/jjb/geode-native/apache-geode-native-test/new_integrationtest.sh b/jjb/geode-native/apache-geode-native-test/new_integrationtest.sh
index ee159ae0a4e9cb6cece17cfde5cef8df6c0cc731..c587f0048d2c7b00f646f5c819e503fb108b170e 100755 (executable)
--- a/jjb/geode-native/apache-geode-native-test/new_integrationtest.sh
+++ b/jjb/geode-native/apache-geode-native-test/new_integrationtest.sh
@@ -24,11 +24,17 @@ set -o pipefail
 GEODE_NATIVE_DIR="${WORKSPACE}/geode-native"
 SOURCE_DIR="/geode-native"
 
-DOCKER_ARGS="--rm --volume=${GEODE_NATIVE_DIR}:${SOURCE_DIR}"
+CTEST_TIMEOUT=600
+CTEST_JOBS=$(( $(nproc) / 4 ))
+CTEST_ARGS="--output-on-failure --repeat until-pass:4 --schedule-random"
+
+DOCKER_ARGS="--rm --volume=${GEODE_NATIVE_DIR}:${SOURCE_DIR}\
+  -e LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libSegFault.so"
 COMMAND="echo -e '\n*** Build ***\n' && mkdir build && cd build &&\
   cmake ${SOURCE_DIR} -DCMAKE_CXX_FLAGS=-stdlib=libc++ \\
   -DCMAKE_CXX_CLANG_TIDY=clang-tidy -DWITH_IPV6=ON &&\
   cmake --build . -- -j${JOBS} && echo -e '\n*** New Integration Tests ***\n' &&\
-  cd /build/cppcache/integration/test && ctest -j1 --extra-verbose"
+  cd /build/cppcache/integration/test &&\
+  ctest -j${CTEST_JOBS} --timeout ${CTEST_TIMEOUT} ${CTEST_ARGS}"
 
 docker run ${DOCKER_ARGS} "${GEODE_NATIVE_DOCKER_IMAGE}" bash -c "${COMMAND}"

diff --git a/jjb/geode-native/global-template-apache-geode-native-test.yaml b/jjb/geode-native/global-template-apache-geode-native-test.yaml
index b5a786845590c0629900de74fed09989b7a3ba26..b1490c041490379816911f8d74f8d0bea4d0e0ab 100644 (file)
--- a/jjb/geode-native/global-template-apache-geode-native-test.yaml
+++ b/jjb/geode-native/global-template-apache-geode-native-test.yaml
@@ -36,7 +36,7 @@
           description: JJB configured PROJECT parameter to identify a Nordix GitHub project
       - string:
           name: BRANCH
-          default: 'release-nordix/1.10.0'
+          default: 'release-nordix/1.13.0'
           description: JJB configured BRANCH parameter for Nordix GitHub project
       - string:
           name: JOBS
@@ -44,8 +44,8 @@
           description: JJB configured JOBS parameter. Specifies the number of make jobs to run simultaneously while building geode-native
       - string:
           name: GEODE_NATIVE_DOCKER_IMAGE
-          default: 'apachegeode/geode-native-build'
-          description: JJB configured name of the geode-native build docker image based on Ubuntu 18.04
+          default: 'apachegeode/geode-native-build:1.13.2'
+          description: JJB configured name of the geode-native build docker image based on Ubuntu 20.04
 
     scm:
       - git-scm-github: