From ca484bbede8dedeefa6f3f791b5989f11c94f086 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Sat, 9 May 2020 19:54:44 +0800 Subject: [PATCH] Deploy retry (#2276) * Wait for helm uninstall chart Signed-off-by: quicksilver * Wait for helm uninstall chart Signed-off-by: quicksilver --- ci/jenkins/step/shardsDevNightlyTest.groovy | 2 +- ci/jenkins/step/singleDevNightlyTest.groovy | 4 ++-- ci/jenkins/step/singleDevTest.groovy | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/jenkins/step/shardsDevNightlyTest.groovy b/ci/jenkins/step/shardsDevNightlyTest.groovy index 6f9b07229a..c8cc760065 100644 --- a/ci/jenkins/step/shardsDevNightlyTest.groovy +++ b/ci/jenkins/step/shardsDevNightlyTest.groovy @@ -13,7 +13,7 @@ timeout(time: 180, unit: 'MINUTES') { helm status -n milvus ${env.SHARDS_HELM_RELEASE_NAME}" def helmResult = sh script: helmStatusCMD, returnStatus: true if (!helmResult) { - sh "helm uninstall -n milvus ${env.SHARDS_HELM_RELEASE_NAME} || sleep 1m" + sh "helm uninstall -n milvus ${env.SHARDS_HELM_RELEASE_NAME} && sleep 1m" } throw exc } diff --git a/ci/jenkins/step/singleDevNightlyTest.groovy b/ci/jenkins/step/singleDevNightlyTest.groovy index ffb8d48689..285718913c 100644 --- a/ci/jenkins/step/singleDevNightlyTest.groovy +++ b/ci/jenkins/step/singleDevNightlyTest.groovy @@ -13,7 +13,7 @@ timeout(time: 180, unit: 'MINUTES') { helm status -n milvus ${env.HELM_RELEASE_NAME}" def helmResult = sh script: helmStatusCMD, returnStatus: true if (!helmResult) { - sh "helm uninstall -n milvus ${env.HELM_RELEASE_NAME} || sleep 1m" + sh "helm uninstall -n milvus ${env.HELM_RELEASE_NAME} && sleep 1m" } throw exc } @@ -43,7 +43,7 @@ timeout(time: 180, unit: 'MINUTES') { helm status -n milvus ${env.HELM_RELEASE_NAME}" def helmResult = sh script: helmStatusCMD, returnStatus: true if (!helmResult) { - sh "helm uninstall -n milvus ${env.HELM_RELEASE_NAME} || sleep 1m" + sh "helm uninstall -n milvus ${env.HELM_RELEASE_NAME} && sleep 1m" } throw exc } diff --git a/ci/jenkins/step/singleDevTest.groovy b/ci/jenkins/step/singleDevTest.groovy index d21dac7ef5..97faca175f 100644 --- a/ci/jenkins/step/singleDevTest.groovy +++ b/ci/jenkins/step/singleDevTest.groovy @@ -13,7 +13,7 @@ timeout(time: 120, unit: 'MINUTES') { helm status -n milvus ${env.HELM_RELEASE_NAME}" def helmResult = sh script: helmStatusCMD, returnStatus: true if (!helmResult) { - sh "helm uninstall -n milvus ${env.HELM_RELEASE_NAME} || sleep 1m" + sh "helm uninstall -n milvus ${env.HELM_RELEASE_NAME} && sleep 1m" } throw exc }