Skip to content

Commit e03b505

Browse files
committed
test: use composite container-logs-check action
1 parent 3874a7b commit e03b505

1 file changed

Lines changed: 7 additions & 24 deletions

File tree

.github/workflows/test.yml

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ on:
1515
- '**.md'
1616

1717
env:
18-
BUILD_TAG: librenms-test
18+
BUILD_TAG: librenms:test
1919
CONTAINER_NAME: librenms
20-
RUNNING_TIMEOUT: 120
21-
RUNNING_LOG_CHECK: ready to handle connections
2220

2321
jobs:
2422
test:
@@ -61,32 +59,17 @@ jobs:
6159
LIBRENMS_IMAGE: ${{ env.BUILD_TAG }}
6260
LIBRENMS_CONTAINER: ${{ env.CONTAINER_NAME }}
6361
-
64-
name: Test run
65-
run: |
66-
TIMEOUT=$((SECONDS + ${{ env.RUNNING_TIMEOUT }}))
67-
while read LOGLINE; do
68-
echo ${LOGLINE}
69-
if [[ ${LOGLINE} == *"${{ env.RUNNING_LOG_CHECK }}"* ]]; then
70-
echo "🎉 Container up!"
71-
break
72-
fi
73-
if [[ $SECONDS -gt ${TIMEOUT} ]]; then
74-
>&2 echo "❌ Failed to run ${{ env.CONTAINER_NAME }} container"
75-
exit 1
76-
fi
77-
done < <(docker logs -f ${{ env.CONTAINER_NAME }} 2>&1)
78-
79-
CONTAINER_STATUS=$(docker container inspect --format "{{.State.Status}}" ${{ env.CONTAINER_NAME }})
80-
if [[ ${CONTAINER_STATUS} != "running" ]]; then
81-
>&2 echo "❌ Container ${{ env.CONTAINER_NAME }} returned status '$CONTAINER_STATUS'"
82-
exit 1
83-
fi
62+
name: Check container logs
63+
uses: crazy-max/.github/.github/actions/container-logs-check@main
64+
with:
65+
container_name: ${{ env.CONTAINER_NAME }}
66+
log_check: "ready to handle connections"
67+
timeout: 120
8468
-
8569
name: Logs
8670
if: always()
8771
run: |
8872
docker compose logs
89-
docker compose down --volumes > /dev/null 2>&1 || true
9073
working-directory: test
9174
env:
9275
LIBRENMS_IMAGE: ${{ env.BUILD_TAG }}

0 commit comments

Comments
 (0)