summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-07-12 14:15:40 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-07-12 14:15:40 +0000
commite0a7858a567eee8ec0aef3c3e4bc9fb9e20ae67c (patch)
tree9cf931aeea28afe2839afd3ce7c84e49270ebca4 /qa
parent5a55dd9936ad1d5c2471ef246b17c4a9a428e6b7 (diff)
parent58d16655e97e09d153676339dddc9a3f45e29ec8 (diff)
downloadgitlab-ce-e0a7858a567eee8ec0aef3c3e4bc9fb9e20ae67c.tar.gz
Merge branch '49139-sleep-before-installing-tiller-to-prevent-race-condition' into 'master'
Resolve "Installing helm tiller sometimes fails with no api token found" Closes #49139 See merge request gitlab-org/gitlab-ce!20580
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/factory/resource/kubernetes_cluster.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/qa/qa/factory/resource/kubernetes_cluster.rb b/qa/qa/factory/resource/kubernetes_cluster.rb
index f32cf985e9d..1c9e5f94b22 100644
--- a/qa/qa/factory/resource/kubernetes_cluster.rb
+++ b/qa/qa/factory/resource/kubernetes_cluster.rb
@@ -36,6 +36,9 @@ module QA
if @install_helm_tiller
Page::Project::Operations::Kubernetes::Show.perform do |page|
+ # We must wait a few seconds for permissions to be setup correctly for new cluster
+ sleep 10
+
# Helm must be installed before everything else
page.install!(:helm)
page.await_installed(:helm)