Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 09:09:38 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 09:09:38 +0300
commited9165c2abda1dca048a8d3cb8030d906c0bbb0c (patch)
tree226d7ad6b9abdc8d2534c3025b488ce9a754dee6 /spec/support
parentb4b9b3854eddd2a4829113ebfc1812c3a332a7d9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/helpers/kubernetes_helpers.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/support/helpers/kubernetes_helpers.rb b/spec/support/helpers/kubernetes_helpers.rb
index 427948bda96..ca910e47695 100644
--- a/spec/support/helpers/kubernetes_helpers.rb
+++ b/spec/support/helpers/kubernetes_helpers.rb
@@ -489,7 +489,7 @@ module KubernetesHelpers
# This is a partial response, it will have many more elements in reality but
# these are the ones we care about at the moment
- def kube_pod(name: "kube-pod", environment_slug: "production", namespace: "project-namespace", project_slug: "project-path-slug", status: "Running", track: nil)
+ def kube_pod(name: "kube-pod", container_name: "container-0", environment_slug: "production", namespace: "project-namespace", project_slug: "project-path-slug", status: "Running", track: nil)
{
"metadata" => {
"name" => name,
@@ -506,8 +506,8 @@ module KubernetesHelpers
},
"spec" => {
"containers" => [
- { "name" => "container-0" },
- { "name" => "container-1" }
+ { "name" => "#{container_name}" },
+ { "name" => "#{container_name}-1" }
]
},
"status" => { "phase" => status }