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 95aad36 Switch dtests to cli logging and to DEBUG. Remove `du`
logging from matrix jobs.
95aad36 is described below
commit 95aad36a88baccda5a89a26a0cbeea8333902062
Author: Mick Semb Wever <[email protected]>
AuthorDate: Sat Oct 3 08:46:17 2020 +0200
Switch dtests to cli logging and to DEBUG. Remove `du` logging from matrix
jobs.
ref: https://the-asf.slack.com/archives/CK23JSY2K/p1601664302080700
---
build-scripts/cassandra-dtest-pytest.sh | 2 +-
jenkins-dsl/cassandra_job_dsl_seed.groovy | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/build-scripts/cassandra-dtest-pytest.sh
b/build-scripts/cassandra-dtest-pytest.sh
index 28b9d38..f78f4dc 100755
--- a/build-scripts/cassandra-dtest-pytest.sh
+++ b/build-scripts/cassandra-dtest-pytest.sh
@@ -89,7 +89,7 @@ if [ "x${DTEST_SPLIT_CHUNK}" != "x" ] ; then
SPLIT_TESTS=$(split -n r/${DTEST_SPLIT_CHUNK} ${WORKSPACE}/test_list.txt)
fi
-PYTEST_OPTS="-vv --log-level="INFO" --junit-xml=nosetests.xml
--junit-prefix=${DTEST_TARGET} -s"
+PYTEST_OPTS="-vv --log-cli-level=DEBUG --junit-xml=nosetests.xml
--junit-prefix=${DTEST_TARGET} -s"
pytest ${PYTEST_OPTS} --cassandra-dir=$CASSANDRA_DIR ${DTEST_ARGS}
${SPLIT_TESTS} 2>&1 | tee -a ${WORKSPACE}/test_stdout.txt
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 1927427..3f76d4c 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -165,7 +165,7 @@ matrixJob('Cassandra-template-artifacts') {
task('.', """
echo "Cleaning project…"; git clean -xdff ;
echo "Pruning docker…" ; docker system prune -f --filter
"until=${maxJobHours}h" ;
- echo "Reporting disk usage…"; df -h ; du -hs ../* ; du -hs
../../* ;
+ echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
find . -type d -name tmp -delete 2>/dev/null ;
find /tmp -type f -atime +2 -user jenkins -and -not -exec
fuser -s {} ';' -and -delete 2>/dev/null
@@ -322,7 +322,7 @@ matrixJob('Cassandra-template-dtest-matrix') {
task('.', """
echo "Cleaning project…"; git clean -xdff ;
echo "Pruning docker…" ; if pgrep -af
"cassandra-artifacts.sh|jenkinscommand.sh"; then docker system prune -f
--filter 'until=${maxJobHours}h'; else docker system prune -f --volumes ; fi;
- echo "Reporting disk usage…"; df -h ; du -hs ../* ; du -hs
../../* ;
+ echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
find . -type d -name tmp -delete 2>/dev/null ;
find /tmp -type f -atime +2 -user jenkins -and -not -exec
fuser -s {} ';' -and -delete 2>/dev/null
@@ -397,7 +397,7 @@ matrixJob('Cassandra-template-cqlsh-tests') {
echo "Finding job process orphans…"; if pgrep -af
"\${JOB_BASE_NAME}"; then pkill -9 -f "\${JOB_BASE_NAME}"; fi;
echo "Cleaning project…"; git clean -xdff ;
echo "Pruning docker…" ; docker system prune -f --filter
"until=${maxJobHours}h" ;
- echo "Reporting disk usage…"; df -h ; du -hs ../* ; du -hs
../../* ;
+ echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
find . -type d -name tmp -delete 2>/dev/null ;
find /tmp -type f -atime +2 -user jenkins -and -not -exec
fuser -s {} ';' -and -delete 2>/dev/null
@@ -633,7 +633,7 @@ matrixJob('Cassandra-devbranch-artifacts') {
task('.', """
echo "Cleaning project…"; git clean -xdff ;
echo "Pruning docker…" ; docker system prune -f --filter
"until=${maxJobHours}h" ;
- echo "Reporting disk usage…"; df -h ; du -hs ../* ; du -hs
../../* ;
+ echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
find . -type d -name tmp -delete 2>/dev/null ;
find /tmp -type -f -atime +3 -user jenkins -and -not -exec
fuser -s {} ';' -and -delete 2>/dev/null
@@ -829,7 +829,7 @@ dtestTargets.each {
task('.', """
echo "Cleaning project…" ; git clean -xdff ;
echo "Pruning docker…" ; if pgrep -af
"cassandra-artifacts.sh|jenkinscommand.sh"; then docker system prune -f
--filter "until=${maxJobHours}h"; else docker system prune -f --volumes ; fi;
- echo "Reporting disk usage…"; df -h ; du -hs ../* ; du -hs
../../* ;
+ echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
find . -type d -name tmp -delete 2>/dev/null ;
find /tmp -type f -atime +2 -user jenkins -and -not -exec
fuser -s {} ';' -and -delete 2>/dev/null
@@ -908,7 +908,7 @@ matrixJob('Cassandra-devbranch-cqlsh-tests') {
echo "Finding job process orphans…"; if pgrep -af
"\${JOB_BASE_NAME}"; then pkill -9 -f "\${JOB_BASE_NAME}"; fi;
echo "Cleaning project…"; git clean -xdff ;
echo "Pruning docker…" ; docker system prune -f --filter
"until=${maxJobHours}h" ;
- echo "Reporting disk usage…"; df -h ; du -hs ../* ; du -hs
../../* ;
+ echo "Reporting disk usage…"; df -h ;
echo "Cleaning tmp…";
find . -type d -name tmp -delete 2>/dev/null ;
find /tmp -type f -atime +2 -user jenkins -and -not -exec
fuser -s {} ';' -and -delete 2>/dev/null
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
