Merge branch 'retry-review-deploy-twice' into 'master'

Retry the review-deploy job twice and make the Review App cleanup more efficient

See merge request gitlab-org/gitlab-ce!27489

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/lib/quality/kubernetes_client_spec.rb b/spec/lib/quality/kubernetes_client_spec.rb
index f35d9464d48..4e77dcc97e6 100644
--- a/spec/lib/quality/kubernetes_client_spec.rb
+++ b/spec/lib/quality/kubernetes_client_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe Quality::KubernetesClient do
       expect(Gitlab::Popen).to receive(:popen_with_detail)
         .with([%(kubectl --namespace "#{namespace}" delete ) \
           'ingress,svc,pdb,hpa,deploy,statefulset,job,pod,secret,configmap,pvc,secret,clusterrole,clusterrolebinding,role,rolebinding,sa ' \
-          "--now -l release=\"#{release_name}\""])
+          "--now --ignore-not-found --include-uninitialized -l release=\"#{release_name}\""])
         .and_return(Gitlab::Popen::Result.new([], '', '', double(success?: false)))
 
       expect { subject.cleanup(release_name: release_name) }.to raise_error(described_class::CommandFailedError)
@@ -23,7 +23,7 @@ RSpec.describe Quality::KubernetesClient do
       expect(Gitlab::Popen).to receive(:popen_with_detail)
         .with([%(kubectl --namespace "#{namespace}" delete ) \
           'ingress,svc,pdb,hpa,deploy,statefulset,job,pod,secret,configmap,pvc,secret,clusterrole,clusterrolebinding,role,rolebinding,sa ' \
-          "--now -l release=\"#{release_name}\""])
+          "--now --ignore-not-found --include-uninitialized -l release=\"#{release_name}\""])
         .and_return(Gitlab::Popen::Result.new([], '', '', double(success?: true)))
 
       # We're not verifying the output here, just silencing it