Merge pull request volcano-sh#52 from volcano-sh/bug/fix_mpi_example_…

…issue
TommyLike · Mar 30, 2019 · 57b990b · 57b990b
2 parents 4be56b9 + cd07f04
commit 57b990b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/example/integrations/mpi/mpi-example.yaml b/example/integrations/mpi/mpi-example.yaml
@@ -3,7 +3,7 @@ kind: Job
 metadata:
   name: lm-mpi-job
 spec:
-  minAvailable: 2
+  minAvailable: 3
   schedulerName: kube-batch
   plugins:
     ssh: []
@@ -24,8 +24,7 @@ spec:
                   MPI_HOST=`cat /etc/volcano/mpiworker.host | tr "\n" ","`;
                   mkdir -p /var/run/sshd; /usr/sbin/sshd;
                   mpiexec --allow-run-as-root --host ${MPI_HOST} -np 2 mpi_hello_world > /home/re;
-              #TODO: use volcano repo instead in the future.
-              image: tommylike/volcano-example-mpi:0.0.1
+              image: volcanosh/example-mpi:0.0.1
               name: mpimaster
               ports:
                 - containerPort: 22
@@ -42,7 +41,7 @@ spec:
                 - -c
                 - |
                   mkdir -p /var/run/sshd; /usr/sbin/sshd -D;
-              image: tommylike/volcano-example-mpi:0.0.1
+              image: volcanosh/example-mpi:0.0.1
               name: mpiworker
               ports:
                 - containerPort: 22

diff --git a/hack/run-e2e-kind.sh b/hack/run-e2e-kind.sh
@@ -5,8 +5,7 @@ export VK_BIN=${VK_ROOT}/_output/bin
 export LOG_LEVEL=3
 export SHOW_VOLCANO_LOGS=${SHOW_VOLCANO_LOGS:-1}
 export CLEANUP_CLUSTER=${CLEANUP_CLUSTER:-1}
-#TODO: Use volcano repo instead in the future
-export MPI_EXAMPLE_IMAGE=${MPI_EXAMPLE_IMAGE:-"tommylike/volcano-example-mpi:0.0.1"}
+export MPI_EXAMPLE_IMAGE=${MPI_EXAMPLE_IMAGE:-"volcanosh/example-mpi:0.0.1"}
 
 if [[ "${CLUSTER_NAME}xxx" != "xxx" ]];then
   export CLUSTER_CONTEXT="--name ${CLUSTER_NAME}"

diff --git a/test/e2e/util.go b/test/e2e/util.go
@@ -59,8 +59,7 @@ const (
 	masterPriority      = "master-pri"
 	defaultNginxImage   = "nginx:1.14"
 	defaultBusyBoxImage = "busybox:1.24"
-	//TODO: Use volcano repo instead in the future
-	defaultMPIImage = "tommylike/volcano-example-mpi:0.0.1"
+	defaultMPIImage     = "volcanosh/example-mpi:0.0.1"
 )
 
 func cpuResource(request string) v1.ResourceList {