Update default values for geode-native jobs

[infra/cicd.git] / jjb / geode-native / apache-geode-native-test / integrationtest.sh

diff --git a/jjb/geode-native/apache-geode-native-test/integrationtest.sh b/jjb/geode-native/apache-geode-native-test/integrationtest.sh
index 91d8ecf585bfc5baad6073f5f4521873ae999098..d6691c5969e329065ef97e1831f0800e1686d898 100755 (executable)
--- a/jjb/geode-native/apache-geode-native-test/integrationtest.sh
+++ b/jjb/geode-native/apache-geode-native-test/integrationtest.sh
@@ -21,15 +21,13 @@ set -o errexit
 set -o pipefail
 #set -o xtrace
 
-GEODE_NATIVE_DIR="$(pwd)/geode-native"
+GEODE_NATIVE_DIR="${WORKSPACE}/geode-native"
 SOURCE_DIR="/geode-native"
 
-DOCKER_ARGS="--volume=${GEODE_NATIVE_DIR}:${SOURCE_DIR}"
+DOCKER_ARGS="--rm --volume=${GEODE_NATIVE_DIR}:${SOURCE_DIR}"
 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 ${SOURCE_DIR}/build/cppcache/integration-test && ctest --timeout 2000 -L STABLE -C Release -j1 &&\
-    echo -e '\n*** New Integration Tests ***\n' &&\
-    cd ${SOURCE_DIR}/build/cppcache/integration/test && ctest -j1"
+  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"
 
 docker run ${DOCKER_ARGS} "${GEODE_NATIVE_DOCKER_IMAGE}" bash -c "${COMMAND}"