diff options
author | Peter Leitzen <pleitzen@gitlab.com> | 2019-07-18 13:45:32 +0200 |
---|---|---|
committer | Peter Leitzen <pleitzen@gitlab.com> | 2019-08-19 18:18:49 +0200 |
commit | cdc6050d574000fefdb4fbfc315496b66cbe4e68 (patch) | |
tree | 6ccc69979bf1efc1c824af126901e3718b25e3ba | |
parent | 0b534df232a56a7cb7a973eafe84aeafc4590750 (diff) | |
download | gitlab-ce-cdc6050d574000fefdb4fbfc315496b66cbe4e68.tar.gz |
Rename CloudProvider -> ClusterProvider
-rw-r--r-- | qa/qa.rb | 10 | ||||
-rw-r--r-- | qa/qa/service/cluster_provider/base.rb (renamed from qa/qa/service/cloud_provider/base.rb) | 2 | ||||
-rw-r--r-- | qa/qa/service/cluster_provider/gcloud.rb (renamed from qa/qa/service/cloud_provider/gcloud.rb) | 2 | ||||
-rw-r--r-- | qa/qa/service/cluster_provider/k3d.rb (renamed from qa/qa/service/cloud_provider/k3d.rb) | 2 | ||||
-rw-r--r-- | qa/qa/service/cluster_provider/minikube.rb (renamed from qa/qa/service/cloud_provider/minikube.rb) | 2 | ||||
-rw-r--r-- | qa/qa/service/kubernetes_cluster.rb | 6 |
6 files changed, 12 insertions, 12 deletions
@@ -360,11 +360,11 @@ module QA autoload :Omnibus, 'qa/service/omnibus' autoload :Runner, 'qa/service/runner' - module CloudProvider - autoload :Base, 'qa/service/cloud_provider/base' - autoload :Gcloud, 'qa/service/cloud_provider/gcloud' - autoload :Minikube, 'qa/service/cloud_provider/minikube' - autoload :K3d, 'qa/service/cloud_provider/k3d' + module ClusterProvider + autoload :Base, 'qa/service/cluster_provider/base' + autoload :Gcloud, 'qa/service/cluster_provider/gcloud' + autoload :Minikube, 'qa/service/cluster_provider/minikube' + autoload :K3d, 'qa/service/cluster_provider/k3d' end end diff --git a/qa/qa/service/cloud_provider/base.rb b/qa/qa/service/cluster_provider/base.rb index 32b4d918f95..a9678557aca 100644 --- a/qa/qa/service/cloud_provider/base.rb +++ b/qa/qa/service/cluster_provider/base.rb @@ -2,7 +2,7 @@ module QA module Service - module CloudProvider + module ClusterProvider class Base include Service::Shellout diff --git a/qa/qa/service/cloud_provider/gcloud.rb b/qa/qa/service/cluster_provider/gcloud.rb index 148c851636a..c30944966d0 100644 --- a/qa/qa/service/cloud_provider/gcloud.rb +++ b/qa/qa/service/cluster_provider/gcloud.rb @@ -2,7 +2,7 @@ module QA module Service - module CloudProvider + module ClusterProvider class Gcloud < Base def validate_dependencies find_executable('gcloud') || raise("You must first install `gcloud` executable to run these tests.") diff --git a/qa/qa/service/cloud_provider/k3d.rb b/qa/qa/service/cluster_provider/k3d.rb index 7fd2f73edb9..81b1688d279 100644 --- a/qa/qa/service/cloud_provider/k3d.rb +++ b/qa/qa/service/cluster_provider/k3d.rb @@ -2,7 +2,7 @@ module QA module Service - module CloudProvider + module ClusterProvider class K3d < Base def validate_dependencies find_executable('k3d') || raise("You must first install `k3d` executable to run these tests.") diff --git a/qa/qa/service/cloud_provider/minikube.rb b/qa/qa/service/cluster_provider/minikube.rb index 08b2c7fbac9..fc916245357 100644 --- a/qa/qa/service/cloud_provider/minikube.rb +++ b/qa/qa/service/cluster_provider/minikube.rb @@ -2,7 +2,7 @@ module QA module Service - module CloudProvider + module ClusterProvider class Minikube < Base def validate_dependencies find_executable('minikube') || raise("You must first install `minikube` executable to run these tests.") diff --git a/qa/qa/service/kubernetes_cluster.rb b/qa/qa/service/kubernetes_cluster.rb index f83def801ce..31138a13959 100644 --- a/qa/qa/service/kubernetes_cluster.rb +++ b/qa/qa/service/kubernetes_cluster.rb @@ -13,9 +13,9 @@ module QA def initialize(rbac: true) @rbac = rbac - @provider = QA::Service::CloudProvider::Gcloud.new(rbac: rbac) - # @provider = QA::Service::CloudProvider::Minikube.new(rbac: rbac) - # @provider = QA::Service::CloudProvider::K3d.new(rbac: rbac) + @provider = QA::Service::ClusterProvider::Gcloud.new(rbac: rbac) + # @provider = QA::Service::ClusterProvider::Minikube.new(rbac: rbac) + # @provider = QA::Service::ClusterProvider::K3d.new(rbac: rbac) end def create! |