fix cleanup bug

Former-commit-id: fcdd0de9624858dbaa62280c8fcaad5e37b8c277

fix cleanup bug
Former-commit-id: fcdd0de9624858dbaa62280c8fcaad5e37b8c277
02fb15b7 · quicksilver · f2eb4ca5 · 02fb15b7 · 02fb15b7 · 02fb15b7
隐藏空白更改
内联并排

Showing with 72 addition and 60 deletion

ci/main_jenkinsfile ci/main_jenkinsfile +24 -20

ci/main_jenkinsfile_no_ut ci/main_jenkinsfile_no_ut +24 -20

ci/nightly_main_jenkinsfile ci/nightly_main_jenkinsfile +24 -20

未找到文件。
--- a/ci/main_jenkinsfile
+++ b/ci/main_jenkinsfile
@@ -193,17 +193,19 @@ spec:
                                    }
                                    post {
                                        always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
+                                            stages {
+                                                stage ("Cleanup Dev") {
+                                                    agent {
+                                                        kubernetes {
+                                                            label 'jenkins-slave'
+                                                            defaultContainer 'jnlp'
+                                                        }
                                                    }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
+                                                    stages {
+                                                        gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                            script {
+                                                                load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
+                                                            }
                                                        }
                                                    }
                                                }
@@ -276,17 +278,19 @@ spec:
                                    }
                                    post {
                                        always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
+                                            stages {
+                                                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"
+                                                    stages {
+                                                        gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                            script {
+                                                                load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
+                                                            }
                                                        }
                                                    }
                                                }

--- a/ci/main_jenkinsfile_no_ut
+++ b/ci/main_jenkinsfile_no_ut
@@ -193,17 +193,19 @@ spec:
                                    }
                                    post {
                                        always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
+                                            stages {
+                                                stage ("Cleanup Dev") {
+                                                    agent {
+                                                        kubernetes {
+                                                            label 'jenkins-slave'
+                                                            defaultContainer 'jnlp'
+                                                        }
                                                    }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
+                                                    stages {
+                                                        gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                            script {
+                                                                load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
+                                                            }
                                                        }
                                                    }
                                                }
@@ -276,17 +278,19 @@ spec:
                                    }
                                    post {
                                        always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
+                                            stages {
+                                                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"
+                                                    stages {
+                                                        gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                            script {
+                                                                load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
+                                                            }
                                                        }
                                                    }
                                                }

--- a/ci/nightly_main_jenkinsfile
+++ b/ci/nightly_main_jenkinsfile
@@ -194,17 +194,19 @@ spec:

                                    post {
                                        always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
+                                            stages {
+                                                stage ("Cleanup Dev") {
+                                                    agent {
+                                                        kubernetes {
+                                                            label 'jenkins-slave'
+                                                            defaultContainer 'jnlp'
+                                                        }
                                                    }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
+                                                    stages {
+                                                        gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                            script {
+                                                                load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
+                                                            }
                                                        }
                                                    }
                                                }
@@ -277,17 +279,19 @@ spec:
                                    }
                                    post {
                                        always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
+                                            stages {
+                                                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"
+                                                    stages {
+                                                        gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                            script {
+                                                                load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
+                                                            }
                                                        }
                                                    }
                                                }