Merge pull request #1967 from jbeda/e2e-fix

Fix e2e test for .ID->.Name change

cluster/validate-cluster.sh

@@ -33,7 +33,7 @@ detect-master > /dev/null
 detect-minions > /dev/null
 
 MINIONS_FILE=/tmp/minions
-"${KUBE_ROOT}/cluster/kubecfg.sh" -template $'{{range.Items}}{{.ID}}\n{{end}}' list minions > ${MINIONS_FILE}
+"${KUBE_ROOT}/cluster/kubecfg.sh" -template $'{{range.Items}}{{.Name}}\n{{end}}' list minions > ${MINIONS_FILE}
 
 # On vSphere, use minion IPs as their names
 if [ "$KUBERNETES_PROVIDER" == "vsphere" ]; then

hack/e2e-suite/basic.sh

@@ -37,7 +37,7 @@ function teardown() {
 
 trap "teardown" EXIT
 
-pod_id_list=$($KUBECFG '-template={{range.Items}}{{.ID}} {{end}}' -l replicationController=my-hostname list pods)
+pod_id_list=$($KUBECFG '-template={{range.Items}}{{.Name}} {{end}}' -l replicationController=my-hostname list pods)
 # Pod turn up on a clean cluster can take a while for the docker image pull.
 all_running=0
 for i in $(seq 1 24); do

hack/e2e-suite/guestbook.sh

@@ -35,7 +35,7 @@ $KUBECFG -c "${GUESTBOOK}/redis-slave-controller.json" create /replicationContro
 
 sleep 5
 
-POD_LIST_1=$($KUBECFG '-template={{range.Items}}{{.ID}} {{end}}' list pods)
+POD_LIST_1=$($KUBECFG '-template={{range.Items}}{{.Meta}} {{end}}' list pods)
 echo "Pods running: ${POD_LIST_1}"
 
 $KUBECFG stop redisSlaveController
@@ -45,7 +45,7 @@ $KUBECFG rm redisSlaveController
 $KUBECFG delete services/redismaster
 $KUBECFG delete pods/redis-master-2
 
-POD_LIST_2=$($KUBECFG '-template={{range.Items}}{{.ID}} {{end}}' list pods)
+POD_LIST_2=$($KUBECFG '-template={{range.Items}}{{.Meta}} {{end}}' list pods)
 echo "Pods running after shutdown: ${POD_LIST_2}"
 
 exit 0

hack/e2e-suite/services.sh

@@ -69,7 +69,7 @@ function query_pods() {
   local i
   for i in $(seq 1 10); do
     pods_unsorted=($(${KUBECFG} \
-        '-template={{range.Items}}{{.ID}} {{end}}' \
+        '-template={{range.Items}}{{.Name}} {{end}}' \
         -l replicationController="$1" list pods))
     found="${#pods_unsorted[*]}"
     if [[ "${found}" == "$2" ]]; then

hack/e2e-suite/update.sh

@@ -38,7 +38,7 @@ function validate() {
     sleep 2
 
     local pod_id_list
-    pod_id_list=($($KUBECFG -template='{{range.Items}}{{.ID}} {{end}}' -l simpleService="${CONTROLLER_NAME}" list pods))
+    pod_id_list=($($KUBECFG -template='{{range.Items}}{{.Name}} {{end}}' -l simpleService="${CONTROLLER_NAME}" list pods))
 
     echo "  ${#pod_id_list[@]} out of ${num_replicas} created"
 

hack/e2e-test.sh

@@ -80,7 +80,7 @@ for test_file in $(ls "${KUBE_ROOT}/hack/e2e-suite/"); do
     fi
   fi
 
-  echo "running $test_file"
+  echo "+++ Running $test_file"
   result=0
   "${KUBE_ROOT}/hack/e2e-suite/${test_file}" || result="$?"
   if [[ "${result}" -eq "0" ]]; then