From 46fbb470178d72de4c74a81ff7294c8892d5c7e0 Mon Sep 17 00:00:00 2001 From: Mick Semb Wever Date: Mon, 14 Jun 2021 12:19:30 +0200 Subject: [PATCH] ninja-fix: revert 'cleaning orphaned processes' until cqlshlib tests are dockerised ref: https://github.com/apache/cassandra-builds/pull/50 --- jenkins-dsl/cassandra_job_dsl_seed.groovy | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy index 0ed85b37..d97a7406 100644 --- a/jenkins-dsl/cassandra_job_dsl_seed.groovy +++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy @@ -416,8 +416,6 @@ cassandraBranches.each { // if the agent is busy, just prune everything that is older than maxJobHours task('.', """ echo "Cleaning project…"; git clean -xdff ; - echo "Cleaning processes…" ; - 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 ; @@ -509,8 +507,6 @@ cassandraBranches.each { // if the agent is busy, just prune everything that is older than maxJobHours 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. || 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 ; @@ -606,8 +602,6 @@ cassandraBranches.each { // if the agent is busy, just prune everything that is older than maxJobHours task('.', """ echo "Cleaning project…"; git clean -xdff ; - echo "Cleaning processes…" ; - 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 ; @@ -661,8 +655,6 @@ cassandraBranches.each { // if the agent is busy, just prune everything that is older than maxJobHours task('.', """ echo "Cleaning project…"; git clean -xdff ; - echo "Cleaning processes…" ; - 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 ; @@ -808,8 +800,6 @@ matrixJob('Cassandra-devbranch-artifacts') { // if the agent is busy, just prune everything that is older than maxJobHours task('.', """ echo "Cleaning project…"; git clean -xdff ; - echo "Cleaning processes…" ; - 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 ; @@ -926,8 +916,6 @@ testTargets.each { // if the agent is busy, just prune everything that is older than maxJobHours 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. || 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 ; @@ -1066,8 +1054,6 @@ archs.each { // if the agent is busy, just prune everything that is older than maxJobHours task('.', """ echo "Cleaning project…" ; git clean -xdff ; - echo "Cleaning processes…" ; - 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 ; @@ -1177,8 +1163,6 @@ matrixJob('Cassandra-devbranch-cqlsh-tests') { // if the agent is busy, just prune everything that is older than maxJobHours task('.', """ echo "Cleaning project…"; git clean -xdff ; - echo "Cleaning processes…" ; - 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 ;