github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-12 20:57:20 +00:00
Code Issues Projects Releases Wiki Activity

Fix e2e test for .ID->.Name change

Browse Source
This commit is contained in:
Joe Beda
2014-10-22 17:19:53 -07:00
parent 6ef6ff5bc5
commit 33763d07b2
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/e2e-suite/basic.sh
View File

@@ -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

4
hack/e2e-suite/guestbook.sh
View File

@@ -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

2
hack/e2e-suite/services.sh
View File

@@ -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

2
hack/e2e-suite/update.sh
View File

@@ -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"