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 663b6e8  On Jenkins jobs, fix the cleaning post-task command on `/tmp` 
(argument to find's `-type` option)
663b6e8 is described below

commit 663b6e8825cc756ffd544848fbd2b5dade0ce5e7
Author: mck <[email protected]>
AuthorDate: Tue Mar 10 11:14:48 2020 +0100

    On Jenkins jobs, fix the cleaning post-task command on `/tmp` (argument to 
find's `-type` option)
---
 jenkins-dsl/cassandra_job_dsl_seed.groovy | 68 ++++++++++++-------------------
 1 file changed, 27 insertions(+), 41 deletions(-)

diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy 
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index cf6eabf..84fce32 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -126,12 +126,10 @@ job('Cassandra-template-artifacts') {
         }
         postBuildTask {
             task('.', '''
-                echo "Cleaning project…";
-                ant realclean;
-                echo "Reporting disk usage…";
-                df -h ; du -hs `pwd` ; du -hs ../* ;
+                echo "Cleaning project…"; ant realclean;
+                echo "Reporting disk usage…"; df -h ; du -hs `pwd` ; du -hs 
../* ;
                 echo "Cleaning tmp…";
-                find /tmp -type -f -atime +3 -user jenkins -and -not -exec 
fuser -s {} ';' -and -delete 2>/dev/null
+                find /tmp -type f -atime +3 -user jenkins -and -not -exec 
fuser -s {} ';' -and -delete 2>/dev/null
                 ''')
         }
     }
@@ -187,13 +185,11 @@ job('Cassandra-template-test') {
         postBuildTask {
             task('.', '''
                 echo "Finding job process orphans…"; if pgrep -af 
${JOB_BASE_NAME}; then pkill -9 -f ${JOB_BASE_NAME}; fi;
-                echo "Cleaning project…";
-                ant realclean;
-                echo "Reporting disk usage…";
-                df -h ; du -hs `pwd` ; du -hs ../* ;
+                echo "Cleaning project…"; ant realclean;
+                echo "Reporting disk usage…"; df -h ; du -hs `pwd` ; du -hs 
../* ;
                 echo "Cleaning tmp…";
-                find /tmp -type -f -atime +3 -user jenkins -and -not -exec 
fuser -s {} ';' -and -delete 2>/dev/null
-                ''')
+                find /tmp -type f -atime +3 -user jenkins -and -not -exec 
fuser -s {} ';' -and -delete 2>/dev/null
+            ''')
         }
     }
 }
@@ -248,13 +244,11 @@ job('Cassandra-template-dtest') {
         postBuildTask {
             task('.', '''
                 echo "Finding job process orphans…"; if pgrep -af 
${JOB_BASE_NAME}; then pkill -9 -f ${JOB_BASE_NAME}; fi;
-                echo "Cleaning project…";
-                ant realclean;
-                echo "Reporting disk usage…";
-                df -h ; du -hs `pwd` ; du -hs ../* ;
+                echo "Cleaning project…"; ant realclean;
+                echo "Reporting disk usage…"; df -h ; du -hs `pwd` ; du -hs 
../* ;
                 echo "Cleaning tmp…";
-                find /tmp -type -f -atime +3 -user jenkins -and -not -exec 
fuser -s {} ';' -and -delete 2>/dev/null
-                ''')
+                find /tmp -type f -atime +3 -user jenkins -and -not -exec 
fuser -s {} ';' -and -delete 2>/dev/null
+            ''')
         }
     }
 }
@@ -314,13 +308,11 @@ matrixJob('Cassandra-template-cqlsh-tests') {
         postBuildTask {
             task('.', '''
                 echo "Finding job process orphans…"; if pgrep -af 
${JOB_BASE_NAME}; then pkill -9 -f ${JOB_BASE_NAME}; fi;
-                echo "Cleaning project…";
-                ant realclean;
-                echo "Reporting disk usage…";
-                df -h ; du -hs `pwd` ; du -hs ../* ;
+                echo "Cleaning project…"; ant realclean;
+                echo "Reporting disk usage…"; df -h ; du -hs `pwd` ; du -hs 
../* ;
                 echo "Cleaning tmp…";
-                find /tmp -type -f -atime +3 -user jenkins -and -not -exec 
fuser -s {} ';' -and -delete 2>/dev/null
-                ''')
+                find /tmp -type f -atime +3 -user jenkins -and -not -exec 
fuser -s {} ';' -and -delete 2>/dev/null
+            ''')
         }
     }
 }
@@ -573,13 +565,11 @@ testTargets.each {
             postBuildTask {
                 task('.', '''
                     echo "Finding job process orphans…"; if pgrep -af 
${JOB_BASE_NAME}; then pkill -9 -f ${JOB_BASE_NAME}; fi;
-                    echo "Cleaning project…";
-                    ant realclean;
-                    echo "Reporting disk usage…";
-                    df -h ; du -hs `pwd` ; du -hs ../* ;
+                    echo "Cleaning project…"; ant realclean;
+                    echo "Reporting disk usage…"; df -h ; du -hs `pwd` ; du 
-hs ../* ;
                     echo "Cleaning tmp…";
-                    find /tmp -type -f -atime +3 -user jenkins -and -not -exec 
fuser -s {} ';' -and -delete 2>/dev/null
-                    ''')
+                    find /tmp -type f -atime +3 -user jenkins -and -not -exec 
fuser -s {} ';' -and -delete 2>/dev/null
+                ''')
             }
         }
     }
@@ -643,13 +633,11 @@ job('Cassandra-devbranch-dtest') {
         postBuildTask {
             task('.', '''
                 echo "Finding job process orphans…"; if pgrep -af 
${JOB_BASE_NAME}; then pkill -9 -f ${JOB_BASE_NAME}; fi;
-                echo "Cleaning project…";
-                ant realclean;
-                echo "Reporting disk usage…";
-                df -h ; du -hs `pwd` ; du -hs ../* ;
+                echo "Cleaning project…"; ant realclean;
+                echo "Reporting disk usage…"; df -h ; du -hs `pwd` ; du -hs 
../* ;
                 echo "Cleaning tmp…";
-                find /tmp -type -f -atime +3 -user jenkins -and -not -exec 
fuser -s {} ';' -and -delete 2>/dev/null
-                ''')
+                find /tmp -type f -atime +3 -user jenkins -and -not -exec 
fuser -s {} ';' -and -delete 2>/dev/null
+            ''')
         }
     }
 }
@@ -718,13 +706,11 @@ matrixJob('Cassandra-devbranch-cqlsh-tests') {
         postBuildTask {
             task('.', '''
                 echo "Finding job process orphans…"; if pgrep -af 
${JOB_BASE_NAME}; then pkill -9 -f ${JOB_BASE_NAME}; fi;
-                echo "Cleaning project…";
-                ant realclean;
-                echo "Reporting disk usage…";
-                df -h ; du -hs `pwd` ; du -hs ../* ;
+                echo "Cleaning project…"; ant realclean;
+                echo "Reporting disk usage…"; df -h ; du -hs `pwd` ; du -hs 
../* ;
                 echo "Cleaning tmp…";
-                find /tmp -type -f -atime +3 -user jenkins -and -not -exec 
fuser -s {} ';' -and -delete 2>/dev/null
-                ''')
+                find /tmp -type f -atime +3 -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]

Reply via email to