From 25457ee3df1faeaf821016025f65692317ee5347 Mon Sep 17 00:00:00 2001
From: Guohan Lu <gulv@microsoft.com>
Date: Fri, 12 Jul 2019 16:29:28 +0000
Subject: [PATCH] [jenkins]: move cleanup ws into always section in post block

---
 jenkins/broadcom/buildimage-brcm-201904/Jenkinsfile       | 4 +++-
 jenkins/broadcom/buildimage-brcm-all/Jenkinsfile          | 4 +++-
 jenkins/common/dep-build/Jenkinsfile                      | 4 +++-
 jenkins/common/sonic-utilities-build-pr/Jenkinsfile       | 8 ++------
 jenkins/common/sonic-utilities-build/Jenkinsfile          | 4 +++-
 jenkins/generic/buildimage-baseimage/Jenkinsfile          | 4 +++-
 jenkins/mellanox/buildimage-mlnx-201904/Jenkinsfile       | 4 +++-
 jenkins/mellanox/buildimage-mlnx-all-pr/Jenkinsfile       | 8 ++------
 .../mellanox/buildimage-mlnx-all-released-pr/Jenkinsfile  | 2 ++
 jenkins/mellanox/buildimage-mlnx-all/Jenkinsfile          | 4 +++-
 jenkins/vs/buildimage-vs-all/Jenkinsfile                  | 4 +++-
 jenkins/vs/buildimage-vs-image-201904/Jenkinsfile         | 4 +++-
 jenkins/vs/buildimage-vs-image/Jenkinsfile                | 4 +++-
 13 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/jenkins/broadcom/buildimage-brcm-201904/Jenkinsfile b/jenkins/broadcom/buildimage-brcm-201904/Jenkinsfile
index 25d4194c7ee1..013b2ed7a83f 100644
--- a/jenkins/broadcom/buildimage-brcm-201904/Jenkinsfile
+++ b/jenkins/broadcom/buildimage-brcm-201904/Jenkinsfile
@@ -45,7 +45,6 @@ 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>)")
@@ -53,5 +52,8 @@ make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-aboot-broadcom.swi
         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
index 5a740a26f65d..1ac0f44bcae2 100644
--- a/jenkins/broadcom/buildimage-brcm-all/Jenkinsfile
+++ b/jenkins/broadcom/buildimage-brcm-all/Jenkinsfile
@@ -47,7 +47,6 @@ 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>)")
@@ -55,5 +54,8 @@ make SONIC_CONFIG_BUILD_JOBS=1 target/docker-syncd-brcm-rpc.gz target/docker-ptf
         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
index ebd9372c09ed..f7195d19e599 100644
--- a/jenkins/common/dep-build/Jenkinsfile
+++ b/jenkins/common/dep-build/Jenkinsfile
@@ -70,7 +70,6 @@ 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>)")
@@ -78,5 +77,8 @@ make SONIC_CONFIG_BUILD_JOBS=1 target/files/stretch/ixgbe.ko \
         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
index 36792299224f..b5e277283c7f 100644
--- 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
index 2bb441faa3b7..a82b417a4c87 100644
--- a/jenkins/common/sonic-utilities-build/Jenkinsfile
+++ b/jenkins/common/sonic-utilities-build/Jenkinsfile
@@ -94,7 +94,6 @@ 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>)")
@@ -102,5 +101,8 @@ sudo py.test -v
         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
index dbebb30c3daa..f4c7a7d40898 100644
--- a/jenkins/generic/buildimage-baseimage/Jenkinsfile
+++ b/jenkins/generic/buildimage-baseimage/Jenkinsfile
@@ -44,7 +44,6 @@ 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>)")
@@ -52,5 +51,8 @@ make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-generic.bin target/sonic-aboot-gener
         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
index f01158ef73bc..4811c7e0fe9e 100644
--- a/jenkins/mellanox/buildimage-mlnx-201904/Jenkinsfile
+++ b/jenkins/mellanox/buildimage-mlnx-201904/Jenkinsfile
@@ -44,7 +44,6 @@ 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>)")
@@ -52,5 +51,8 @@ make SONIC_CONFIG_BUILD_JOBS=1 ENABLE_DHCP_GRAPH_SERVICE=y target/sonic-mellanox
         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
index 442602b692c8..93fb1e1f07d6 100644
--- 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
index 286100a622b3..706439e82a0a 100644
--- 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
index a12e6a17ae0a..e52d25b308c6 100644
--- a/jenkins/mellanox/buildimage-mlnx-all/Jenkinsfile
+++ b/jenkins/mellanox/buildimage-mlnx-all/Jenkinsfile
@@ -46,7 +46,6 @@ 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>)")
@@ -54,5 +53,8 @@ ENABLE_SYNCD_RPC=y make SONIC_CONFIG_BUILD_JOBS=1 target/docker-syncd-mlnx-rpc.g
         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
index 12090091023c..0e59d382c8f4 100644
--- a/jenkins/vs/buildimage-vs-all/Jenkinsfile
+++ b/jenkins/vs/buildimage-vs-all/Jenkinsfile
@@ -49,7 +49,6 @@ 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>)")
@@ -57,5 +56,8 @@ sudo py.test -v
         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
index a767b0549295..194a75229fc3 100644
--- a/jenkins/vs/buildimage-vs-image-201904/Jenkinsfile
+++ b/jenkins/vs/buildimage-vs-image-201904/Jenkinsfile
@@ -47,7 +47,6 @@ 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>)")
@@ -55,5 +54,8 @@ make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-vs.img.gz
         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
index d807d3207ed8..1d245264fc91 100644
--- a/jenkins/vs/buildimage-vs-image/Jenkinsfile
+++ b/jenkins/vs/buildimage-vs-image/Jenkinsfile
@@ -47,7 +47,6 @@ 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>)")
@@ -55,5 +54,8 @@ make SONIC_CONFIG_BUILD_JOBS=1 target/sonic-vs.img.gz
         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)
+        }
     }
 }