Skip to content

Commit

Permalink
ninja-fix: pkill returns non-zero on no matches
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelsembwever
michaelsembwever committed Jun 12, 2021
1 parent 84ea05d commit 9a0af58
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions jenkins-dsl/cassandra_job_dsl_seed.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;
Expand Down Expand Up @@ -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 ;
Expand Down Expand Up @@ -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 ;
Expand Down Expand Up @@ -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 ;
Expand Down Expand Up @@ -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 ;
Expand Down Expand Up @@ -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 ;
Expand Down Expand Up @@ -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 ;
Expand Down Expand Up @@ -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 ;
Expand Down

0 comments on commit 9a0af58

Please sign in to comment.