Skip to content

D
docker-elk
Unverified Commit fff244e4 authored by Antoine Cotten's avatar Antoine Cotten
Browse files
Options

ci: Avoid printing unnecessary empty lines

parent 282a8bbc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
.github/workflows/scripts/lib/testing.sh
View file @ fff244e4
...@@ -7,7 +7,7 @@ function log { ...@@ -7,7 +7,7 @@ function log {
# Log an error. # Log an error.
function err { function err {
echo -e "\n[x] $1\n" echo -e "\n[x] $1\n" >&2
} }
# Return the ID of the container running the given service. # Return the ID of the container running the given service.
...@@ -22,6 +22,7 @@ function container_id { ...@@ -22,6 +22,7 @@ function container_id {
fi fi
local cid local cid
# retry for max 60s (30*2s) # retry for max 60s (30*2s)
for _ in $(seq 1 30); do for _ in $(seq 1 30); do
cid="$(docker container ls -aq -f label="$label")" cid="$(docker container ls -aq -f label="$label")"
...@@ -32,7 +33,6 @@ function container_id { ...@@ -32,7 +33,6 @@ function container_id {
echo -n '.' >&2 echo -n '.' >&2
sleep 2 sleep 2
done done
echo -e '\n' >&2
if [ -z "${cid:-}" ]; then if [ -z "${cid:-}" ]; then
err "Timed out waiting for creation of container with label ${label}" err "Timed out waiting for creation of container with label ${label}"
...@@ -107,7 +107,6 @@ function poll_ready { ...@@ -107,7 +107,6 @@ function poll_ready {
echo -n 'x' >&2 echo -n 'x' >&2
sleep 5 sleep 5
done done
echo -e '\n' >&2
echo -e "\n${output::-3}" echo -e "\n${output::-3}"
......
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