From 2abe69ffb51f1b77e4fd3c551ee0bf061f117fb0 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Sun, 14 Jul 2019 21:08:49 +0800 Subject: [PATCH] fix clean up bug Former-commit-id: 041f4f5f8beb650d9d0277d4745ef0d1b8820866 --- ci/jenkinsfile/cleanup_dev.groovy | 6 +++--- ci/jenkinsfile/cluster_cleanup_dev.groovy | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/jenkinsfile/cleanup_dev.groovy b/ci/jenkinsfile/cleanup_dev.groovy index 1b7e67e1b0..2e9332fa6e 100644 --- a/ci/jenkinsfile/cleanup_dev.groovy +++ b/ci/jenkinsfile/cleanup_dev.groovy @@ -1,11 +1,11 @@ try { - def result = sh script: "helm status ${env.JOB_NAME}-${env.BUILD_NUMBER}", returnStatus: true - if (result) { + def result = sh script: "helm status ${env.JOB_NAME}-${env.BUILD_NUMBER}", returnStatus: true + if (!result) { sh "helm del --purge ${env.JOB_NAME}-${env.BUILD_NUMBER}" } } catch (exc) { def result = sh script: "helm status ${env.JOB_NAME}-${env.BUILD_NUMBER}", returnStatus: true - if (result) { + if (!result) { sh "helm del --purge ${env.JOB_NAME}-${env.BUILD_NUMBER}" } throw exc diff --git a/ci/jenkinsfile/cluster_cleanup_dev.groovy b/ci/jenkinsfile/cluster_cleanup_dev.groovy index 9a73d0a291..e57988fefe 100644 --- a/ci/jenkinsfile/cluster_cleanup_dev.groovy +++ b/ci/jenkinsfile/cluster_cleanup_dev.groovy @@ -1,11 +1,11 @@ try { def result = sh script: "helm status ${env.JOB_NAME}-${env.BUILD_NUMBER}-cluster", returnStatus: true - if (result) { + if (!result) { sh "helm del --purge ${env.JOB_NAME}-${env.BUILD_NUMBER}-cluster" } } catch (exc) { def result = sh script: "helm status ${env.JOB_NAME}-${env.BUILD_NUMBER}-cluster", returnStatus: true - if (result) { + if (!result) { sh "helm del --purge ${env.JOB_NAME}-${env.BUILD_NUMBER}-cluster" } throw exc