github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #704 from derekwaynecarr/issue_603

Browse Source 
Improve testing reliability
This commit is contained in:
brendandburns 2014-08-04 09:11:57 -07:00
commit 6564f14ac4
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,17 +33,25 @@ function remove-quotes() {
echo $stripped
}
function teardown() {
echo "Cleaning up test artifacts"
$CLOUDCFG stop myNginx
$CLOUDCFG rm myNginx
}
trap "teardown" EXIT
POD_ID_LIST=$($CLOUDCFG -json -l name=myNginx list pods | jq ".items[].id")
# Container turn up on a clean cluster can take a while for the docker image pull.
ALL_RUNNING=false
while [[ $ALL_RUNNING -ne "true" ]]; do
echo "Waiting for containers to come up."
ALL_RUNNING=0
while [ $ALL_RUNNING -ne 1 ]; do
echo "Waiting for all containers in pod to come up."
sleep 5
ALL_RUNNING=true
ALL_RUNNING=1
for id in $POD_ID_LIST; do
CURRENT_STATUS=$(remove-quotes $($CLOUDCFG -json get "pods/$(remove-quotes ${id})" | jq '.currentState.status'))
if [[ $CURRENT_STATUS -ne "Running" ]]; then
ALL_RUNNING=false
CURRENT_STATUS=$(remove-quotes $($CLOUDCFG -json get "pods/$(remove-quotes ${id})" | jq '.currentState.info["mynginx"].State.Running and .currentState.info["net"].State.Running'))
if [ "$CURRENT_STATUS" != "true" ]; then
ALL_RUNNING=0
fi
done
done
@ -51,6 +59,10 @@ done
# Get minion IP addresses
detect-minions
# let images stabilize
echo "Letting images stabilize"
sleep 5
# Verify that something is listening (nginx should give us a 404)
for (( i=0; i<${#KUBE_MINION_IP_ADDRESSES[@]}; i++)); do
IP_ADDRESS=${KUBE_MINION_IP_ADDRESSES[$i]}
@ -58,7 +70,4 @@ for (( i=0; i<${#KUBE_MINION_IP_ADDRESSES[@]}; i++)); do
curl "http://${IP_ADDRESS}:8080"
done
$CLOUDCFG stop myNginx
$CLOUDCFG rm myNginx
exit 0