diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 175496c3..8f1e1af5 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -21,8 +21,6 @@ on: env: BUILD_TAG: 'diun:local' CONTAINER_NAME: 'diun' - RUNNING_TIMEOUT: '240' - RUNNING_LOG_CHECK: 'Next run in' jobs: e2e: @@ -75,26 +73,12 @@ jobs: -e "LOG_LEVEL=${{ matrix.loglevel }}" \ ${{ env.BUILD_TAG }} - - name: Test run - run: | - TIMEOUT=$((SECONDS + ${{ env.RUNNING_TIMEOUT }})) - while read LOGLINE; do - echo ${LOGLINE} - if [[ ${LOGLINE} == *"${{ env.RUNNING_LOG_CHECK }}"* ]]; then - echo "🎉 Container up!" - break - fi - if [[ $SECONDS -gt ${TIMEOUT} ]]; then - >&2 echo "❌ Failed to run ${{ env.CONTAINER_NAME }} container" - exit 1 - fi - done < <(docker logs -f ${{ env.CONTAINER_NAME }} 2>&1) - - CONTAINER_STATUS=$(docker container inspect --format "{{.State.Status}}" ${{ env.CONTAINER_NAME }}) - if [[ ${CONTAINER_STATUS} != "running" ]]; then - >&2 echo "❌ Container ${{ env.CONTAINER_NAME }} returned status '$CONTAINER_STATUS'" - exit 1 - fi + name: Check container logs + uses: crazy-max/.github/.github/actions/container-logs-check@main + with: + container_name: ${{ env.CONTAINER_NAME }} + log_check: "Next run in" + timeout: 240 - name: List images in db run: |