github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1193 from jbeda/fix-e2e

Browse Source 
Fix up some flaky behavior of the new improved update e2e test.
This commit is contained in:
Daniel Smith 2014-09-05 13:17:23 -07:00
commit e4cd06d2b9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,11 +42,11 @@ function validate() {
CURRENT_STATUS=$($KUBECFG -template "${TEMPLATE_STRING}" get pods/$id)
if [ "$CURRENT_STATUS" != "true" ]; then
ALL_RUNNING=0
fi
CURRENT_IMAGE=$($KUBECFG -template "{{(index .CurrentState.Info \"${CONTROLLER_NAME}\").Config.Image}}" get pods/$id)
if [ "$CURRENT_IMAGE" != "${DOCKER_HUB_USER}/update-demo:${CONTAINER_IMAGE_VERSION}" ]; then
ALL_RUNNING=0
else
CURRENT_IMAGE=$($KUBECFG -template "{{(index .CurrentState.Info \"${CONTROLLER_NAME}\").Config.Image}}" get pods/$id)
if [ "$CURRENT_IMAGE" != "${DOCKER_HUB_USER}/update-demo:${CONTAINER_IMAGE_VERSION}" ]; then
ALL_RUNNING=0
fi
fi
done
done
@ -58,7 +58,7 @@ function validate() {
fi
}
DOCKER_HUB_USER=jbeda
export DOCKER_HUB_USER=jbeda
# Launch a container
${KUBE_REPO_ROOT}/examples/update-demo/1-create-replication-controller.sh