diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 21:07:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 21:07:54 +0000 |
commit | 2fd92f2dc784ade9cb4e1c33dd60cbfad7b86818 (patch) | |
tree | 7779f36689db97a46e0268a4aec1d49f283eb0c8 /qa/qa/specs | |
parent | 42ca24aa5bbab7a2d43bc866d9bee9876941cea2 (diff) | |
download | gitlab-ce-2fd92f2dc784ade9cb4e1c33dd60cbfad7b86818.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/specs')
-rw-r--r-- | qa/qa/specs/features/browser_ui/7_configure/kubernetes/kubernetes_integration_spec.rb | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/qa/qa/specs/features/browser_ui/7_configure/kubernetes/kubernetes_integration_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/kubernetes/kubernetes_integration_spec.rb index 73b5a579e08..728f22aed89 100644 --- a/qa/qa/specs/features/browser_ui/7_configure/kubernetes/kubernetes_integration_spec.rb +++ b/qa/qa/specs/features/browser_ui/7_configure/kubernetes/kubernetes_integration_spec.rb @@ -2,10 +2,9 @@ module QA context 'Configure' do - # This test requires GITLAB_QA_ADMIN_ACCESS_TOKEN to be specified - describe 'Kubernetes Cluster Integration', :orchestrated, :kubernetes, :requires_admin, :skip do + describe 'Kubernetes Cluster Integration', :orchestrated, :kubernetes, :requires_admin do context 'Project Clusters' do - let(:cluster) { Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3d).create! } + let(:cluster) { Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3s).create! } let(:project) do Resource::Project.fabricate_via_api! do |project| project.name = 'project-with-k8s' @@ -35,18 +34,6 @@ module QA expect(index).to have_cluster(cluster) end end - - it 'installs helm and tiller on a gitlab managed app' do - Resource::KubernetesCluster.fabricate_via_browser_ui! do |k8s_cluster| - k8s_cluster.project = project - k8s_cluster.cluster = cluster - k8s_cluster.install_helm_tiller = true - end - - Page::Project::Operations::Kubernetes::Show.perform do |show| - expect(show).to have_application_installed(:helm) - end - end end end end |