Merge pull request #1193 from jbeda/fix-e2e

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

View File

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