iac
/
docker-elk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Avoid printing unnecessary empty lines

This commit is contained in:
Antoine Cotten 2021-01-07 20:35:27 +01:00
parent 282a8bbc85
commit fff244e45a
No known key found for this signature in database
GPG Key ID: 94637E68D4A79DD0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/scripts/lib/testing.sh vendored
View File

@ -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 {
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 {
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 {
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}"