[jenkins]: move cleanup ws into always section in post block

xumia · Jul 12, 2019 · 25457ee · 25457ee
1 parent 5094fee
commit 25457ee
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 22 deletions.
diff --git a/jenkins/broadcom/buildimage-brcm-201904/Jenkinsfile b/jenkins/broadcom/buildimage-brcm-201904/Jenkinsfile
@@ -45,13 +45,15 @@ make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-aboot-broadcom.swi
 
         success {
             archiveArtifacts(artifacts: 'target/**')
-            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
         }
         fixed {
             slackSend(color:'#00FF00', message: "Build job back to normal: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
         regression {
             slackSend(color:'#FF0000', message: "Build job Regression: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
+        always {
+            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
+        }
     }
 }
diff --git a/jenkins/broadcom/buildimage-brcm-all/Jenkinsfile b/jenkins/broadcom/buildimage-brcm-all/Jenkinsfile
@@ -47,13 +47,15 @@ make SONIC_CONFIG_BUILD_JOBS=1 target/docker-syncd-brcm-rpc.gz target/docker-ptf
 
         success {
             archiveArtifacts(artifacts: 'target/**')
-            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
         }
         fixed {
             slackSend(color:'#00FF00', message: "Build job back to normal: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
         regression {
             slackSend(color:'#FF0000', message: "Build job Regression: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
+        always {
+            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
+        }
     }
 }
diff --git a/jenkins/common/dep-build/Jenkinsfile b/jenkins/common/dep-build/Jenkinsfile
@@ -70,13 +70,15 @@ make SONIC_CONFIG_BUILD_JOBS=1 target/files/stretch/ixgbe.ko \
 
         success {
             archiveArtifacts(artifacts: 'target/**')
-            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
         }
         fixed {
             slackSend(color:'#00FF00', message: "Build job back to normal: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
         regression {
             slackSend(color:'#FF0000', message: "Build job Regression: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
+        always {
+            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
+        }
     }
 }
diff --git a/jenkins/common/sonic-utilities-build-pr/Jenkinsfile b/jenkins/common/sonic-utilities-build-pr/Jenkinsfile
@@ -95,13 +95,9 @@ sudo py.test -v
 
         success {
             archiveArtifacts(artifacts: 'sonic-utilities/deb_dist/python-sonic-utilities_1.2-1_all.deb,wheels/sonic_config_engine-1.0-py2-none-any.whl,wheels/swsssdk-2.0.1-py2-none-any.whl, sonic-swss/tests/log/**')
-            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
-        }
-        fixed {
-            slackSend(color:'#00FF00', message: "Build job back to normal: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
-        regression {
-            slackSend(color:'#FF0000', message: "Build job Regression: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
+        always {
+            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
         }
     }
 }
diff --git a/jenkins/common/sonic-utilities-build/Jenkinsfile b/jenkins/common/sonic-utilities-build/Jenkinsfile
@@ -94,13 +94,15 @@ sudo py.test -v
 
         success {
             archiveArtifacts(artifacts: 'sonic-utilities/deb_dist/python-sonic-utilities_1.2-1_all.deb,wheels/sonic_config_engine-1.0-py2-none-any.whl,wheels/swsssdk-2.0.1-py2-none-any.whl, sonic-swss/tests/log/**')
-            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
         }
         fixed {
             slackSend(color:'#00FF00', message: "Build job back to normal: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
         regression {
             slackSend(color:'#FF0000', message: "Build job Regression: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
+        always {
+            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
+        }
     }
 }
diff --git a/jenkins/generic/buildimage-baseimage/Jenkinsfile b/jenkins/generic/buildimage-baseimage/Jenkinsfile
@@ -44,13 +44,15 @@ make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-generic.bin target/sonic-aboot-gener
 
         success {
             archiveArtifacts(artifacts: 'target/**')
-            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
         }
         fixed {
             slackSend(color:'#00FF00', message: "Build job back to normal: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
         regression {
             slackSend(color:'#FF0000', message: "Build job Regression: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
+        always {
+            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
+        }
     }
 }
diff --git a/jenkins/mellanox/buildimage-mlnx-201904/Jenkinsfile b/jenkins/mellanox/buildimage-mlnx-201904/Jenkinsfile
@@ -44,13 +44,15 @@ make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y target/sonic-mellanox
 
         success {
             archiveArtifacts(artifacts: 'target/**')
-            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
         }
         fixed {
             slackSend(color:'#00FF00', message: "Build job back to normal: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
         regression {
             slackSend(color:'#FF0000', message: "Build job Regression: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
+        always {
+            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
+        }
     }
 }
diff --git a/jenkins/mellanox/buildimage-mlnx-all-pr/Jenkinsfile b/jenkins/mellanox/buildimage-mlnx-all-pr/Jenkinsfile
@@ -43,13 +43,9 @@ make SONIC_CONFIG_BUILD_JOBS=1 all
 
         success {
             archiveArtifacts(artifacts: 'target/**')
-            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
-        }
-        fixed {
-            slackSend(color:'#00FF00', message: "Build job back to normal: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
-        regression {
-            slackSend(color:'#FF0000', message: "Build job Regression: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
+        always {
+            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
         }
     }
 }
diff --git a/jenkins/mellanox/buildimage-mlnx-all-released-pr/Jenkinsfile b/jenkins/mellanox/buildimage-mlnx-all-released-pr/Jenkinsfile
@@ -40,6 +40,8 @@ make SONIC_CONFIG_BUILD_JOBS=1 all
 
         success {
             archiveArtifacts(artifacts: 'target/**')
+        }
+        always {
             cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
         }
     }

diff --git a/jenkins/mellanox/buildimage-mlnx-all/Jenkinsfile b/jenkins/mellanox/buildimage-mlnx-all/Jenkinsfile
@@ -46,13 +46,15 @@ ENABLE_SYNCD_RPC=y make SONIC_CONFIG_BUILD_JOBS=1 target/docker-syncd-mlnx-rpc.g
 
         success {
             archiveArtifacts(artifacts: 'target/**')
-            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
         }
         fixed {
             slackSend(color:'#00FF00', message: "Build job back to normal: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
         regression {
             slackSend(color:'#FF0000', message: "Build job Regression: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
+        always {
+            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
+        }
     }
 }
diff --git a/jenkins/vs/buildimage-vs-all/Jenkinsfile b/jenkins/vs/buildimage-vs-all/Jenkinsfile
@@ -49,13 +49,15 @@ sudo py.test -v
 
         success {
             archiveArtifacts(artifacts: 'target/**, platform/vs/**')
-            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
         }
         fixed {
             slackSend(color:'#00FF00', message: "Build job back to normal: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
         regression {
             slackSend(color:'#FF0000', message: "Build job Regression: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
+        always {
+            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
+        }
     }
 }
diff --git a/jenkins/vs/buildimage-vs-image-201904/Jenkinsfile b/jenkins/vs/buildimage-vs-image-201904/Jenkinsfile
@@ -47,13 +47,15 @@ make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-vs.img.gz
 
         success {
             archiveArtifacts(artifacts: 'target/**')
-            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
         }
         fixed {
             slackSend(color:'#00FF00', message: "Build job back to normal: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
         regression {
             slackSend(color:'#FF0000', message: "Build job Regression: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
+        always {
+            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
+        }
     }
 }
diff --git a/jenkins/vs/buildimage-vs-image/Jenkinsfile b/jenkins/vs/buildimage-vs-image/Jenkinsfile
@@ -47,13 +47,15 @@ make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-vs.img.gz
 
         success {
             archiveArtifacts(artifacts: 'target/**')
-            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
         }
         fixed {
             slackSend(color:'#00FF00', message: "Build job back to normal: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
         regression {
             slackSend(color:'#FF0000', message: "Build job Regression: ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)")
         }
+        always {
+            cleanWs(disableDeferredWipeout: false, deleteDirs: true, notFailBuild: true)
+        }
     }
 }