Run curl via a docker container

So that it has connectivity to the network the other containers are on.

Signed-off-by: Bryan Boreham <[email protected]>

Author: bboreham

integration-tests/common.sh

@@ -9,6 +9,11 @@ STORAGE_ARGS="-config-yaml=/tests/schema1.yaml -dynamodb.url=dynamodb://u:p@dyna
 INGESTER_ARGS="$COMMON_ARGS $STORAGE_ARGS -ingester.num-tokens=4 -ingester.min-ready-duration=1s --ingester.final-sleep=0s -ingester.concurrent-flushes=5"
 RUN_ARGS="--net=cortex -v $TEST_DIR:/tests"
 
+# Run curl on the same network as the test containers (on CircleCI this is not connected to the host)
+run_curl() {
+    docker run $RUN_ARGS --rm byrnedo/alpine-curl "$@"
+}
+
 # Execute command $1 repeatedly until it returns true; description in $2, optional repeat limit in $3
 wait_for() {
     reps=${3:-10}

integration-tests/test-flush.sh

@@ -16,10 +16,10 @@ docker run $RUN_ARGS -d --name=i1 --hostname=i1 quay.io/cortexproject/ingester:$
 
 sleep 5
 I1_ADDR=$(container_ip i1)
-wait_for "curl -s -f -m 3 $I1_ADDR/ready" "ingester ready"
+wait_for "run_curl -s -f -m 3 $I1_ADDR/ready" "ingester ready"
 
 has_tokens_owned() {
-    curl -s -f -m 3 $1/metrics | grep 'cortex_ring_tokens_owned' >/dev/null
+    run_curl -s -f -m 3 $1/metrics | grep 'cortex_ring_tokens_owned' >/dev/null
 }
 DIST_ADDR=$(container_ip distributor)
 wait_for "has_tokens_owned $DIST_ADDR" "distributor to see ingester in ring"

integration-tests/test-handover.sh

@@ -12,10 +12,10 @@ echo Start first ingester
 docker run $RUN_ARGS -d --name=i1 --hostname=i1 quay.io/cortexproject/ingester:$IMAGE_TAG $INGESTER_ARGS -ingester.claim-on-rollout=true
 
 I1_ADDR=$(container_ip i1)
-wait_for "curl -s -f -m 3 $I1_ADDR:/ready" "ingester ready"
+wait_for "run_curl -s -f -m 3 $I1_ADDR:/ready" "ingester ready"
 
 has_tokens_owned() {
-    curl -s -f -m 3 $1:/metrics | grep -q 'cortex_ring_tokens_owned'
+    run_curl -s -f -m 3 $1:/metrics | grep -q 'cortex_ring_tokens_owned'
 }
 DIST_ADDR=$(container_ip distributor)
 wait_for "has_tokens_owned $DIST_ADDR" "distributor to see ingester in ring"