This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/master by this push: new d1600ac Undo dtest `--keep-test-dir` (not enough disk space) d1600ac is described below commit d1600acde19cdbd906b0ff89318d3e8a3f400a70 Author: Mick Semb Wever <m...@apache.org> AuthorDate: Mon Jun 8 09:24:10 2020 +0200 Undo dtest `--keep-test-dir` (not enough disk space) --- build-scripts/cassandra-dtest-pytest.sh | 12 ++++++------ jenkins-dsl/cassandra_job_dsl_seed.groovy | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build-scripts/cassandra-dtest-pytest.sh b/build-scripts/cassandra-dtest-pytest.sh index b8a38a0..cad2e62 100755 --- a/build-scripts/cassandra-dtest-pytest.sh +++ b/build-scripts/cassandra-dtest-pytest.sh @@ -65,22 +65,22 @@ cd cassandra-dtest/ mkdir -p ${TMPDIR} set +e # disable immediate exit from this point if [ "${DTEST_TARGET}" = "dtest" ]; then - pytest -vv --log-level="INFO" --use-vnodes --num-tokens=32 --junit-xml=nosetests.xml --junit-prefix=${DTEST_TARGET} -s --cassandra-dir=$CASSANDRA_DIR --skip-resource-intensive-tests --keep-test-dir 2>&1 | tee -a ${WORKSPACE}/test_stdout.txt + pytest -vv --log-level="INFO" --use-vnodes --num-tokens=32 --junit-xml=nosetests.xml --junit-prefix=${DTEST_TARGET} -s --cassandra-dir=$CASSANDRA_DIR --skip-resource-intensive-tests 2>&1 | tee -a ${WORKSPACE}/test_stdout.txt elif [ "${DTEST_TARGET}" = "dtest-novnode" ]; then - pytest -vv --log-level="INFO" --junit-xml=nosetests.xml --junit-prefix=${DTEST_TARGET} -s --cassandra-dir=$CASSANDRA_DIR --skip-resource-intensive-tests --keep-test-dir 2>&1 | tee -a ${WORKSPACE}/test_stdout.txt + pytest -vv --log-level="INFO" --junit-xml=nosetests.xml --junit-prefix=${DTEST_TARGET} -s --cassandra-dir=$CASSANDRA_DIR --skip-resource-intensive-tests 2>&1 | tee -a ${WORKSPACE}/test_stdout.txt elif [ "${DTEST_TARGET}" = "dtest-offheap" ]; then - pytest -vv --log-level="INFO" --use-vnodes --num-tokens=32 --use-off-heap-memtables --junit-xml=nosetests.xml --junit-prefix=${DTEST_TARGET} -s --cassandra-dir=$CASSANDRA_DIR --skip-resource-intensive-tests --keep-test-dir 2>&1 | tee -a ${WORKSPACE}/test_stdout.txt + pytest -vv --log-level="INFO" --use-vnodes --num-tokens=32 --use-off-heap-memtables --junit-xml=nosetests.xml --junit-prefix=${DTEST_TARGET} -s --cassandra-dir=$CASSANDRA_DIR --skip-resource-intensive-tests 2>&1 | tee -a ${WORKSPACE}/test_stdout.txt elif [ "${DTEST_TARGET}" = "dtest-large" ]; then - pytest -vv --log-level="INFO" --use-vnodes --num-tokens=32 --junit-xml=nosetests.xml --junit-prefix=${DTEST_TARGET} -s --cassandra-dir=$CASSANDRA_DIR --only-resource-intensive-tests --keep-test-dir 2>&1 | tee -a ${WORKSPACE}/test_stdout.txt + pytest -vv --log-level="INFO" --use-vnodes --num-tokens=32 --junit-xml=nosetests.xml --junit-prefix=${DTEST_TARGET} -s --cassandra-dir=$CASSANDRA_DIR --only-resource-intensive-tests 2>&1 | tee -a ${WORKSPACE}/test_stdout.txt elif [ "${DTEST_TARGET}" = "dtest-upgrade" ]; then export RUN_STATIC_UPGRADE_MATRIX=true - pytest -vv --log-level="INFO" --execute-upgrade-tests-only --junit-xml=nosetests.xml --junit-prefix=${DTEST_TARGET} -s --cassandra-dir=$CASSANDRA_DIR --keep-test-dir 2>&1 | tee -a ${WORKSPACE}/test_stdout.txt + pytest -vv --log-level="INFO" --execute-upgrade-tests-only --junit-xml=nosetests.xml --junit-prefix=${DTEST_TARGET} -s --cassandra-dir=$CASSANDRA_DIR 2>&1 | tee -a ${WORKSPACE}/test_stdout.txt else echo "Unknown dtest target: ${DTEST_TARGET}" exit 1 fi -# tar up ccm logs for easy retrieval +# tar up any ccm logs for easy retrieval tar -cJf ccm_logs.tar.xz ${TMPDIR}/*/test/*/logs/* ################################ diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy index 4c6fe65..5f72d43 100644 --- a/jenkins-dsl/cassandra_job_dsl_seed.groovy +++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy @@ -255,7 +255,7 @@ job('Cassandra-template-dtest') { postBuildTask { task('.', ''' echo "Cleaning project…"; git clean -xdff ; - echo "Pruning docker…" ; if pgrep -af jenkinscommand.sh; then system prune -f --filter 'until=48h'; else docker system prune -f --volumes ; fi; + echo "Pruning docker…" ; if pgrep -af jenkinscommand.sh; then docker system prune -f --filter 'until=48h'; else docker system prune -f --volumes ; fi; echo "Reporting disk usage…"; df -h ; find . -maxdepth 2 -type d -exec du -hs {} ';' ; du -hs ../* ; echo "Cleaning tmp…"; find . -type d -name tmp -delete 2>/dev/null ; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org