Skip to content

K
k3s
Commit 9cb7bc2e authored by Wojciech Tyczynski's avatar Wojciech Tyczynski
Browse files
Options

Fix Shell services test

parent 41f89075
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
hack/e2e-suite/services.sh
View file @ 9cb7bc2e
...@@ -233,12 +233,12 @@ function wait_for_service_up() { ...@@ -233,12 +233,12 @@ function wait_for_service_up() {
results=($(ssh-to-node "${test_node}" " results=($(ssh-to-node "${test_node}" "
set -e; set -e;
for i in $(seq -s' ' 1 $(($4*3))); do for i in $(seq -s' ' 1 $(($4*3))); do
curl -s --connect-timeout 1 http://$2:$3; wget -q -T 1 -O - http://$2:$3 || true;
echo; echo;
done | sort -n | uniq done | sort -n | uniq
")) "))
found_pods=$(sort_args "${results[@]}") found_pods=$(sort_args "${results[@]:+${results[@]}}")
if [[ "${found_pods}" == "$5" ]]; then if [[ "${found_pods}" == "$5" ]]; then
return return
fi fi
...@@ -280,12 +280,12 @@ function verify_from_container() { ...@@ -280,12 +280,12 @@ function verify_from_container() {
sudo docker pull gcr.io/google_containers/busybox >/dev/null; sudo docker pull gcr.io/google_containers/busybox >/dev/null;
sudo docker run gcr.io/google_containers/busybox sh -c ' sudo docker run gcr.io/google_containers/busybox sh -c '
for i in $(seq -s' ' 1 $(($4*3))); do for i in $(seq -s' ' 1 $(($4*3))); do
wget -q -T 1 -O - http://$2:$3; wget -q -T 1 -O - http://$2:$3 || true;
echo; echo;
done done
'" | sort -n | uniq)) '" | sort -n | uniq))
found_pods=$(sort_args "${results[@]}") found_pods=$(sort_args "${results[@]:+${results[@]}}")
if [[ "${found_pods}" == "$5" ]]; then if [[ "${found_pods}" == "$5" ]]; then
return return
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment