Commit 13c2b769 authored by Thong Kuah's avatar Thong Kuah

Merge branch 'qa-k8s-add-node-size' into 'master'

Add support for controlling amount of nodes

See merge request gitlab-org/gitlab-ce!31299
parents ed85fcfa 8a00c6b8
...@@ -181,6 +181,10 @@ module QA ...@@ -181,6 +181,10 @@ module QA
ENV.fetch('GCLOUD_REGION') ENV.fetch('GCLOUD_REGION')
end end
def gcloud_num_nodes
ENV.fetch('GCLOUD_NUM_NODES', 3)
end
def has_gcloud_credentials? def has_gcloud_credentials?
%w[GCLOUD_ACCOUNT_KEY GCLOUD_ACCOUNT_EMAIL].none? { |var| ENV[var].to_s.empty? } %w[GCLOUD_ACCOUNT_KEY GCLOUD_ACCOUNT_EMAIL].none? { |var| ENV[var].to_s.empty? }
end end
......
...@@ -30,6 +30,7 @@ module QA ...@@ -30,6 +30,7 @@ module QA
--enable-basic-auth --enable-basic-auth
--region #{Runtime::Env.gcloud_region} --region #{Runtime::Env.gcloud_region}
--disk-size 10GB --disk-size 10GB
--num-nodes #{Runtime::Env.gcloud_num_nodes}
&& gcloud container clusters && gcloud container clusters
get-credentials get-credentials
--region #{Runtime::Env.gcloud_region} --region #{Runtime::Env.gcloud_region}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment