diff --git a/ci/jenkinsfile/cleanup_dev.groovy b/ci/jenkinsfile/cleanup_dev.groovy
index 664c452f342502068a4813a8eefaa2dcab9349f1..056b8fa8c5fd4a2f849a7e4a0d9482d34eec81b5 100644
--- a/ci/jenkinsfile/cleanup_dev.groovy
+++ b/ci/jenkinsfile/cleanup_dev.groovy
@@ -1,5 +1,11 @@
 try {
     sh "helm del --purge ${env.JOB_NAME}-${env.BUILD_NUMBER}"
+
+    if (currentBuild.result == 'ABORTED') {
+        throw new hudson.AbortException("Dev Test Aborted !")
+    } else if (currentBuild.result == 'FAILURE') {
+        error("Dev Test Failure !")
+    }
 } catch (exc) {
     sh "helm del --purge ${env.JOB_NAME}-${env.BUILD_NUMBER}"
     updateGitlabCommitStatus name: 'Cleanup Dev', state: 'failed'
diff --git a/ci/jenkinsfile/cluster_cleanup_dev.groovy b/ci/jenkinsfile/cluster_cleanup_dev.groovy
index 9708669b9e88832fff7b3259cdf8eb4f7c9dc908..dc18067cdda256d6bcaf9e0279097e9d71984dff 100644
--- a/ci/jenkinsfile/cluster_cleanup_dev.groovy
+++ b/ci/jenkinsfile/cluster_cleanup_dev.groovy
@@ -1,5 +1,11 @@
 try {
     sh "helm del --purge ${env.JOB_NAME}-${env.BUILD_NUMBER}-cluster"
+
+    if (currentBuild.result == 'ABORTED') {
+        throw new hudson.AbortException("Cluster Dev Test Aborted !")
+    } else if (currentBuild.result == 'FAILURE') {
+        error("Dev Test Failure !")
+    }
 } catch (exc) {
     sh "helm del --purge ${env.JOB_NAME}-${env.BUILD_NUMBER}-cluster"
     updateGitlabCommitStatus name: 'Cleanup Dev', state: 'failed'
diff --git a/ci/jenkinsfile/cluster_dev_test.groovy b/ci/jenkinsfile/cluster_dev_test.groovy
index d3c6a1983280416d767a63b4b3d18bb07dda88a6..50fd67f80392e9301d27aacc17c3bfd487b794df 100644
--- a/ci/jenkinsfile/cluster_dev_test.groovy
+++ b/ci/jenkinsfile/cluster_dev_test.groovy
@@ -9,8 +9,8 @@ container('milvus-testframework') {
                 }
             } catch (exc) {
                 updateGitlabCommitStatus name: 'Dev Test', state: 'failed'
+                currentBuild.result = 'FAILURE'
                 echo 'Milvus Test Failed !'
-                throw exc
             }
         }
     }
diff --git a/ci/jenkinsfile/dev_test.groovy b/ci/jenkinsfile/dev_test.groovy
index 40348726150062d3febbfe54c4f7dd929e23a957..13e1c868b8620ac26243349a8fc6908e1466cebd 100644
--- a/ci/jenkinsfile/dev_test.groovy
+++ b/ci/jenkinsfile/dev_test.groovy
@@ -9,8 +9,8 @@ container('milvus-testframework') {
                 }
             } catch (exc) {
                 updateGitlabCommitStatus name: 'Dev Test', state: 'failed'
+                currentBuild.result = 'FAILURE'
                 echo 'Milvus Test Failed !'
-                throw exc
             }
         }
     }
diff --git a/ci/main_jenkinsfile b/ci/main_jenkinsfile
index dc5e879817091d2b011534e0b76b9083c4b77b46..a324ff44416c139d27b98af9351e85d5e2a7a2bf 100644
--- a/ci/main_jenkinsfile
+++ b/ci/main_jenkinsfile
@@ -191,25 +191,41 @@ spec:
                                             }
                                         }
                                     }
-                                    post {
-                                        always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
-                                                    }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
-                                                        }
+                                }
+
+                                stage ("Cleanup Dev") {
+                                    agent {
+                                        kubernetes {
+                                            label 'jenkins-slave'
+                                            defaultContainer 'jnlp'
+                                        }
+                                    }
+                                    stages {
+                                        stage('Cleanup') {
+                                            steps {
+                                                gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                    script {
+                                                        load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
                                                     }
                                                 }
                                             }
                                         }
                                     }
+                                    post {
+                                        aborted {
+                                            script {
+                                                updateGitlabCommitStatus name: 'Cleanup Dev', state: 'canceled'
+                                                echo "Milvus Cleanup Dev aborted !"
+                                            }
+                                        }
+
+                                        failure {
+                                            script {
+                                                updateGitlabCommitStatus name: 'Cleanup Dev', state: 'failed'
+                                                echo "Milvus Cleanup Dev failure !"
+                                            }
+                                        }
+                                    }
                                 }
                             }
                         }
@@ -274,25 +290,41 @@ spec:
                                             }
                                         }
                                     }
-                                    post {
-                                        always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
-                                                    }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
-                                                        }
+                                }
+
+                                stage ("Cleanup Dev") {
+                                    agent {
+                                        kubernetes {
+                                            label 'jenkins-slave'
+                                            defaultContainer 'jnlp'
+                                        }
+                                    }
+                                    stages {
+                                        stage('Cleanup') {
+                                            steps {
+                                                gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                    script {
+                                                        load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
                                                     }
                                                 }
                                             }
                                         }
                                     }
+                                    post {
+                                        aborted {
+                                            script {
+                                                updateGitlabCommitStatus name: 'Cleanup Dev', state: 'canceled'
+                                                echo "Milvus Cleanup Dev aborted !"
+                                            }
+                                        }
+
+                                        failure {
+                                            script {
+                                                updateGitlabCommitStatus name: 'Cleanup Dev', state: 'failed'
+                                                echo "Milvus Cleanup Dev failure !"
+                                            }
+                                        }
+                                    }
                                 }
                             }
                         }
@@ -343,3 +375,4 @@ spec:
         }
     }
 }
+
diff --git a/ci/main_jenkinsfile_no_ut b/ci/main_jenkinsfile_no_ut
index 35ebc647785f0d9ef84ab2c67a26d583a98d5848..203b185e146875bf20dc7575bf32c1e0bfbd09fd 100644
--- a/ci/main_jenkinsfile_no_ut
+++ b/ci/main_jenkinsfile_no_ut
@@ -191,25 +191,41 @@ spec:
                                             }
                                         }
                                     }
-                                    post {
-                                        always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
-                                                    }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
-                                                        }
+                                }
+
+                                stage ("Cleanup Dev") {
+                                    agent {
+                                        kubernetes {
+                                            label 'jenkins-slave'
+                                            defaultContainer 'jnlp'
+                                        }
+                                    }
+                                    stages {
+                                        stage('Cleanup') {
+                                            steps {
+                                                gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                    script {
+                                                        load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
                                                     }
                                                 }
                                             }
                                         }
                                     }
+                                    post {
+                                        aborted {
+                                            script {
+                                                updateGitlabCommitStatus name: 'Cleanup Dev', state: 'canceled'
+                                                echo "Milvus Cleanup Dev aborted !"
+                                            }
+                                        }
+
+                                        failure {
+                                            script {
+                                                updateGitlabCommitStatus name: 'Cleanup Dev', state: 'failed'
+                                                echo "Milvus Cleanup Dev failure !"
+                                            }
+                                        }
+                                    }
                                 }
                             }
                         }
@@ -274,25 +290,41 @@ spec:
                                             }
                                         }
                                     }
-                                    post {
-                                        always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
-                                                    }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
-                                                        }
+                                }
+
+                                stage ("Cleanup Dev") {
+                                    agent {
+                                        kubernetes {
+                                            label 'jenkins-slave'
+                                            defaultContainer 'jnlp'
+                                        }
+                                    }
+                                    stages {
+                                        stage('Cleanup') {
+                                            steps {
+                                                gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                    script {
+                                                        load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
                                                     }
                                                 }
                                             }
                                         }
                                     }
+                                    post {
+                                        aborted {
+                                            script {
+                                                updateGitlabCommitStatus name: 'Cleanup Dev', state: 'canceled'
+                                                echo "Milvus Cleanup Dev aborted !"
+                                            }
+                                        }
+
+                                        failure {
+                                            script {
+                                                updateGitlabCommitStatus name: 'Cleanup Dev', state: 'failed'
+                                                echo "Milvus Cleanup Dev failure !"
+                                            }
+                                        }
+                                    }
                                 }
                             }
                         }
@@ -305,18 +337,16 @@ spec:
     post {
         always {
             script {
-                if (env.gitlabAfter != null) {
-                    if (!currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
-                        // Send an email only if the build status has changed from green/unstable to red
-                        emailext subject: '$DEFAULT_SUBJECT',
-                        body: '$DEFAULT_CONTENT',
-                        recipientProviders: [
-                            [$class: 'DevelopersRecipientProvider'],
-                            [$class: 'RequesterRecipientProvider']
-                        ],
-                        replyTo: '$DEFAULT_REPLYTO',
-                        to: '$DEFAULT_RECIPIENTS'
-                    }
+                if (!currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
+                    // Send an email only if the build status has changed from green/unstable to red
+                    emailext subject: '$DEFAULT_SUBJECT',
+                    body: '$DEFAULT_CONTENT',
+                    recipientProviders: [
+                        [$class: 'DevelopersRecipientProvider'],
+                        [$class: 'RequesterRecipientProvider']
+                    ],
+                    replyTo: '$DEFAULT_REPLYTO',
+                    to: '$DEFAULT_RECIPIENTS'
                 }
             }
         }
@@ -343,3 +373,4 @@ spec:
         }
     }
 }
+
diff --git a/ci/nightly_main_jenkinsfile b/ci/nightly_main_jenkinsfile
index 7b39ed386c0bc54cf00cecb15a5665349aa3af34..c375cc87eae59874892312f1ff6f2ba2ebfad385 100644
--- a/ci/nightly_main_jenkinsfile
+++ b/ci/nightly_main_jenkinsfile
@@ -191,26 +191,41 @@ spec:
                                             }
                                         }
                                     }
+                                }
 
-                                    post {
-                                        always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
-                                                    }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
-                                                        }
+                                stage ("Cleanup Dev") {
+                                    agent {
+                                        kubernetes {
+                                            label 'jenkins-slave'
+                                            defaultContainer 'jnlp'
+                                        }
+                                    }
+                                    stages {
+                                        stage('Cleanup') {
+                                            steps {
+                                                gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                    script {
+                                                        load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
                                                     }
                                                 }
                                             }
                                         }
                                     }
+                                    post {
+                                        aborted {
+                                            script {
+                                                updateGitlabCommitStatus name: 'Cleanup Dev', state: 'canceled'
+                                                echo "Milvus Cleanup Dev aborted !"
+                                            }
+                                        }
+
+                                        failure {
+                                            script {
+                                                updateGitlabCommitStatus name: 'Cleanup Dev', state: 'failed'
+                                                echo "Milvus Cleanup Dev failure !"
+                                            }
+                                        }
+                                    }
                                 }
                             }
                         }
@@ -275,25 +290,41 @@ spec:
                                             }
                                         }
                                     }
-                                    post {
-                                        always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
-                                                    }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
-                                                        }
+                                }
+
+                                stage ("Cleanup Dev") {
+                                    agent {
+                                        kubernetes {
+                                            label 'jenkins-slave'
+                                            defaultContainer 'jnlp'
+                                        }
+                                    }
+                                    stages {
+                                        stage('Cleanup') {
+                                            steps {
+                                                gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                    script {
+                                                        load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
                                                     }
                                                 }
                                             }
                                         }
                                     }
+                                    post {
+                                        aborted {
+                                            script {
+                                                updateGitlabCommitStatus name: 'Cleanup Dev', state: 'canceled'
+                                                echo "Milvus Cleanup Dev aborted !"
+                                            }
+                                        }
+
+                                        failure {
+                                            script {
+                                                updateGitlabCommitStatus name: 'Cleanup Dev', state: 'failed'
+                                                echo "Milvus Cleanup Dev failure !"
+                                            }
+                                        }
+                                    }
                                 }
                             }
                         }
@@ -342,3 +373,4 @@ spec:
         }
     }
 }
+