This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9a0af58 ninja-fix: pkill returns non-zero on no matches
9a0af58 is described below
commit 9a0af58b4060365beb5412fb05d65153c5240532
Author: Mick Semb Wever <[email protected]>
AuthorDate: Sat Jun 12 11:00:46 2021 +0200
ninja-fix: pkill returns non-zero on no matches
---
jenkins-dsl/cassandra_job_dsl_seed.groovy | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 08c8dc4..0ed85b3 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -417,7 +417,7 @@ cassandraBranches.each {
task('.', """
echo "Cleaning project…"; git clean -xdff ;
echo "Cleaning processes…" ;
- if ! pgrep -af "cassandra-builds/build-scripts" ; then
pkill -9 -f org.apache.cassandra. ; fi ;
+ if ! pgrep -af "cassandra-builds/build-scripts" ; then
pkill -9 -f org.apache.cassandra. || echo "already clean" ; fi ;
echo "Pruning docker…" ;
if pgrep -af "cassandra-builds/build-scripts" ; then
docker system prune --all --force --filter "until=${maxJobHours}h" || true ;
else docker system prune --all --force --volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
@@ -510,7 +510,7 @@ cassandraBranches.each {
task('.', """
echo "Cleaning project…"; git clean -xdff -e
build/test/jmh-result.json ;
echo "Cleaning processes…" ;
- if ! pgrep -af "cassandra-builds/build-scripts" ;
then pkill -9 -f org.apache.cassandra. ; fi ;
+ if ! pgrep -af "cassandra-builds/build-scripts" ;
then pkill -9 -f org.apache.cassandra. || echo "already clean" ; fi ;
echo "Pruning docker…" ;
if pgrep -af "cassandra-builds/build-scripts" ;
then docker system prune --all --force --filter "until=${maxJobHours}h" || true
; else docker system prune --all --force --volumes || true ; fi;
echo "Reporting disk usage…"; du -xm / 2>/dev/null
| sort -rn | head -n 30 ; df -h ;
@@ -607,7 +607,7 @@ cassandraBranches.each {
task('.', """
echo "Cleaning project…"; git clean -xdff ;
echo "Cleaning processes…" ;
- if ! pgrep -af
"cassandra-builds/build-scripts" ; then pkill -9 -f org.apache.cassandra. ; fi ;
+ if ! pgrep -af
"cassandra-builds/build-scripts" ; then pkill -9 -f org.apache.cassandra. ||
echo "already clean" ; fi ;
echo "Pruning docker…" ;
if pgrep -af "cassandra-builds/build-scripts"
; then docker system prune --all --force --filter "until=${maxJobHours}h" ||
true ; else docker system prune --all --force --volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
@@ -662,7 +662,7 @@ cassandraBranches.each {
task('.', """
echo "Cleaning project…"; git clean -xdff ;
echo "Cleaning processes…" ;
- if ! pgrep -af "cassandra-builds/build-scripts" ; then
pkill -9 -f org.apache.cassandra. ; fi ;
+ if ! pgrep -af "cassandra-builds/build-scripts" ; then
pkill -9 -f org.apache.cassandra. || echo "already clean" ; fi ;
echo "Pruning docker…" ;
if pgrep -af "cassandra-builds/build-scripts" ; then
docker system prune --all --force --filter "until=${maxJobHours}h" || true ;
else docker system prune --all --force --volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
@@ -809,7 +809,7 @@ matrixJob('Cassandra-devbranch-artifacts') {
task('.', """
echo "Cleaning project…"; git clean -xdff ;
echo "Cleaning processes…" ;
- if ! pgrep -af "cassandra-builds/build-scripts" ; then pkill
-9 -f org.apache.cassandra. ; fi ;
+ if ! pgrep -af "cassandra-builds/build-scripts" ; then pkill
-9 -f org.apache.cassandra. || echo "already clean" ; fi ;
echo "Pruning docker…" ;
if pgrep -af "cassandra-builds/build-scripts" ; then docker
system prune --all --force --filter "until=${maxJobHours}h" || true ; else
docker system prune --all --force --volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
@@ -927,7 +927,7 @@ testTargets.each {
task('.', """
echo "Cleaning project…"; git clean -xdff ${targetName ==
'microbench' ? '-e build/test/jmh-result.json' : ''};
echo "Cleaning processes…" ;
- if ! pgrep -af "cassandra-builds/build-scripts" ; then
pkill -9 -f org.apache.cassandra. ; fi ;
+ if ! pgrep -af "cassandra-builds/build-scripts" ; then
pkill -9 -f org.apache.cassandra. || echo "already clean" ; fi ;
echo "Pruning docker…" ;
if pgrep -af "cassandra-builds/build-scripts" ; then
docker system prune --all --force --filter "until=${maxJobHours}h" || true ;
else docker system prune --all --force --volumes || true ; fi;
echo "Reporting disk usage…"; du -xm / 2>/dev/null | sort
-rn | head -n 30 ; df -h ;
@@ -1067,7 +1067,7 @@ archs.each {
task('.', """
echo "Cleaning project…" ; git clean -xdff ;
echo "Cleaning processes…" ;
- if ! pgrep -af "cassandra-builds/build-scripts" ; then
pkill -9 -f org.apache.cassandra. ; fi ;
+ if ! pgrep -af "cassandra-builds/build-scripts" ; then
pkill -9 -f org.apache.cassandra. || echo "already clean" ; fi ;
echo "Pruning docker…" ;
if pgrep -af "cassandra-builds/build-scripts" ; then
docker system prune --all --force --filter "until=${maxJobHours}h" || true ;
else docker system prune --all --force --volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
@@ -1178,7 +1178,7 @@ matrixJob('Cassandra-devbranch-cqlsh-tests') {
task('.', """
echo "Cleaning project…"; git clean -xdff ;
echo "Cleaning processes…" ;
- if ! pgrep -af "cassandra-builds/build-scripts" ; then pkill
-9 -f org.apache.cassandra. ; fi ;
+ if ! pgrep -af "cassandra-builds/build-scripts" ; then pkill
-9 -f org.apache.cassandra. || echo "already clean" ; fi ;
echo "Pruning docker…" ;
if pgrep -af "cassandra-builds/build-scripts" ; then docker
system prune --all --force --filter "until=${maxJobHours}h" || true ; else
docker system prune --all --force --volumes || true ; fi;
echo "Reporting disk usage…"; df -h ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
