Skip to content

K
k3s
Commit 0ed6432f authored by Tim Hockin's avatar Tim Hockin
Browse files
Options

Merge pull request #17356 from thockin/fix_examples_test

Fix the petstore example test with iptables proxy
parents e82277b8 7f0ed03f
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
examples/k8petstore/k8petstore-loadbalancer.sh
View file @ 0ed6432f
...@@ -253,7 +253,7 @@ function pollfor { ...@@ -253,7 +253,7 @@ function pollfor {
do do
### Just testing that the front end comes up. Not sure how to test total entries etc... (yet) ### Just testing that the front end comes up. Not sure how to test total entries etc... (yet)
echo "Trying curl ... $PUBLIC_IP:3000 , attempt $i . expect a few failures while pulling images... " echo "Trying curl ... $PUBLIC_IP:3000 , attempt $i . expect a few failures while pulling images... "
curl "$PUBLIC_IP:3000" > result curl --connect-timeout 1 "$PUBLIC_IP:3000" > result
cat result cat result
cat result | grep -q "k8-bps" cat result | grep -q "k8-bps"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
...@@ -279,7 +279,7 @@ function tests { ...@@ -279,7 +279,7 @@ function tests {
for i in `seq 1 $_SECONDS`; for i in `seq 1 $_SECONDS`;
do do
echo "curl : $PUBLIC_IP:3000 , $i of $_SECONDS" echo "curl : $PUBLIC_IP:3000 , $i of $_SECONDS"
curr_cnt="`curl "$PUBLIC_IP:3000/llen"`" curr_cnt="`curl --connect-timeout 1 "$PUBLIC_IP:3000/llen"`"
### Write CSV File of # of trials / total transcations. ### Write CSV File of # of trials / total transcations.
echo "$i $curr_cnt" >> result echo "$i $curr_cnt" >> result
echo "total transactions so far : $curr_cnt" echo "total transactions so far : $curr_cnt"
......
examples/k8petstore/k8petstore-nodeport.sh
View file @ 0ed6432f
...@@ -270,8 +270,8 @@ function pollfor { ...@@ -270,8 +270,8 @@ function pollfor {
for i in `seq 1 150`; for i in `seq 1 150`;
do do
### Just testing that the front end comes up. Not sure how to test total entries etc... (yet) ### Just testing that the front end comes up. Not sure how to test total entries etc... (yet)
echo "Trying curl ... $PUBLIC_IP:3000 , attempt $i . expect a few failures while pulling images... " echo "Trying curl frontend:3000 via $TEST_IP:$NODE_PORT, attempt ${i}. Expect a few failures while pulling images... "
curl "$TEST_IP:$NODE_PORT" > result curl --connect-timeout 1 "$TEST_IP:$NODE_PORT" > result
cat result cat result
cat result | grep -q "k8-bps" cat result | grep -q "k8-bps"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
...@@ -296,7 +296,7 @@ function tests { ...@@ -296,7 +296,7 @@ function tests {
for i in `seq 1 $_SECONDS`; for i in `seq 1 $_SECONDS`;
do do
echo "curl : $TEST_IP:$NODE_PORT , $i of $_SECONDS" echo "curl : $TEST_IP:$NODE_PORT , $i of $_SECONDS"
curr_cnt="`curl "$TEST_IP:$NODE_PORT/llen"`" curr_cnt="`curl --connect-timeout 1 "$TEST_IP:$NODE_PORT/llen"`"
### Write CSV File of # of trials / total transcations. ### Write CSV File of # of trials / total transcations.
echo "$i $curr_cnt" >> result echo "$i $curr_cnt" >> result
echo "total transactions so far : $curr_cnt" echo "total transactions so far : $curr_cnt"
......
examples/k8petstore/k8petstore.sh
View file @ 0ed6432f
...@@ -237,7 +237,7 @@ function pollfor { ...@@ -237,7 +237,7 @@ function pollfor {
do do
### Just testing that the front end comes up. Not sure how to test total entries etc... (yet) ### Just testing that the front end comes up. Not sure how to test total entries etc... (yet)
echo "Trying curl ... $PUBLIC_IP:3000 , attempt $i . expect a few failures while pulling images... " echo "Trying curl ... $PUBLIC_IP:3000 , attempt $i . expect a few failures while pulling images... "
curl "$PUBLIC_IP:3000" > result curl --connect-timeout 1 "$PUBLIC_IP:3000" > result
cat result cat result
cat result | grep -q "k8-bps" cat result | grep -q "k8-bps"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
...@@ -263,7 +263,7 @@ function tests { ...@@ -263,7 +263,7 @@ function tests {
for i in `seq 1 $_SECONDS`; for i in `seq 1 $_SECONDS`;
do do
echo "curl : $PUBLIC_IP:3000 , $i of $_SECONDS" echo "curl : $PUBLIC_IP:3000 , $i of $_SECONDS"
curr_cnt="`curl "$PUBLIC_IP:3000/llen"`" curr_cnt="`curl --connect-timeout 1 "$PUBLIC_IP:3000/llen"`"
### Write CSV File of # of trials / total transcations. ### Write CSV File of # of trials / total transcations.
echo "$i $curr_cnt" >> result echo "$i $curr_cnt" >> result
echo "total transactions so far : $curr_cnt" echo "total transactions so far : $curr_cnt"
......
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