Merge pull request volcano-sh#37 from volcano-sh/bug/fix_slice_error

kevin-wangzefeng · Mar 22, 2019 · 21bdff6 · 21bdff6
2 parents c0b43c1 + d43fe8c
commit 21bdff6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/test/e2e/job_scheduling.go b/test/e2e/job_scheduling.go
@@ -260,7 +260,7 @@ var _ = Describe("Job E2E Test", func() {
 			namespace: "test",
 			tasks: []taskSpec{
 				{
-					img: "nginx",
+					img: defaultNginxImage,
 					req: slot,
 					min: rep,
 					rep: rep,

diff --git a/test/e2e/util.go b/test/e2e/util.go
@@ -533,12 +533,16 @@ func waitJobUnschedulable(ctx *context, job *vkv1.Job) error {
 func createContainers(img, command string, req v1.ResourceList, hostport int32) []v1.Container {
 	container := v1.Container{
 		Image:           img,
-		Name:            img[:strings.Index(img, ":")],
 		ImagePullPolicy: v1.PullIfNotPresent,
 		Resources: v1.ResourceRequirements{
 			Requests: req,
 		},
 	}
+	if strings.Index(img, ":") < 0 {
+		container.Name = img
+	} else {
+		container.Name = img[:strings.Index(img, ":")]
+	}
 
 	if len(command) > 0 {
 		container.Command = []string{"/bin/sh"}