github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-05 19:21:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix e2e tests.

Browse Source
This commit is contained in:
Dawn Chen
2014-10-03 16:25:54 -07:00
parent 39f648bda2
commit a86d496f9a
7 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ while [ $ALL_RUNNING -ne 1 ]; do
ALL_RUNNING=1
for id in $POD_ID_LIST; do
CURRENT_STATUS=$($KUBECFG -template '{{and .CurrentState.Info.mynginx.State.Running .CurrentState.Info.net.State.Running}}' get pods/$id)
if [ "$CURRENT_STATUS" != "{}" ]; then
if [ "$CURRENT_STATUS" != "{0001-01-01 00:00:00 +0000 UTC}" ]; then
ALL_RUNNING=0
fi
done

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

@@ -47,12 +47,12 @@ function validate() {
local template_string current_status current_image host_ip
template_string="{{and ((index .CurrentState.Info \"${CONTROLLER_NAME}\").State.Running) .CurrentState.Info.net.State.Running}}"
current_status=$($KUBECFG -template="${template_string}" get "pods/$id")
if [[ "$current_status" != "{}" ]]; then
if [ "$current_status" != "{0001-01-01 00:00:00 +0000 UTC}" ]; then
echo " $id is created but not running"
continue
fi
template_string="{{(index .CurrentState.Info \"${CONTROLLER_NAME}\").DetailInfo.Config.Image}}"
template_string="{{(index .CurrentState.Info \"${CONTROLLER_NAME}\").Image}}"
current_image=$($KUBECFG -template="${template_string}" get "pods/$id")
if [[ "$current_image" != "${DOCKER_HUB_USER}/update-demo:${container_image_version}" ]]; then
echo " ${id} is created but running wrong image"