diff options
| author | Peter Leitzen <pleitzen@gitlab.com> | 2019-08-09 10:45:12 +0000 |
|---|---|---|
| committer | Peter Leitzen <pleitzen@gitlab.com> | 2019-08-19 18:18:49 +0200 |
| commit | 121e10e619737dce8b2a0694e6644339ac3ae020 (patch) | |
| tree | 0ddf28a6a7ab9cfbcab29fe546996bdcb0c1db2b | |
| parent | 29ecbb6386a954368f07c39f7fd6e85fa4317fd9 (diff) | |
| download | gitlab-ce-pl-qa-k8s.tar.gz | |
Fully qualify region envvarpl-qa-k8s
| -rw-r--r-- | qa/qa/service/cluster_provider/gcloud.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/qa/qa/service/cluster_provider/gcloud.rb b/qa/qa/service/cluster_provider/gcloud.rb index c30944966d0..9c82151666c 100644 --- a/qa/qa/service/cluster_provider/gcloud.rb +++ b/qa/qa/service/cluster_provider/gcloud.rb @@ -9,7 +9,7 @@ module QA end def set_credentials(admin_user) - master_auth = JSON.parse(`gcloud container clusters describe #{cluster_name} --region #{region} --format 'json(masterAuth.username, masterAuth.password)'`) + master_auth = JSON.parse(`gcloud container clusters describe #{cluster_name} --region #{Runtime::Env.gcloud_region} --format 'json(masterAuth.username, masterAuth.password)'`) shell <<~CMD.tr("\n", ' ') kubectl config set-credentials #{admin_user} @@ -63,12 +63,12 @@ module QA create #{cluster_name} #{auth_options} --enable-basic-auth - --region #{region} + --region #{Runtime::Env.gcloud_region} --disk-size 10GB --num-nodes #{Runtime::Env.gcloud_num_nodes} && gcloud container clusters get-credentials - --region #{region} + --region #{Runtime::Env.gcloud_region} #{cluster_name} CMD end @@ -76,15 +76,11 @@ module QA def delete_cluster shell <<~CMD.tr("\n", ' ') gcloud container clusters delete - --region #{region} + --region #{Runtime::Env.gcloud_region} #{cluster_name} --quiet --async CMD end - - def region - Runtime::Env.gcloud_region - end end end end |