diff --git a/.github/workflows/deploy-gcp-tests.yml b/.github/workflows/deploy-gcp-tests.yml index 31b7609639e..6710ba3e5c9 100644 --- a/.github/workflows/deploy-gcp-tests.yml +++ b/.github/workflows/deploy-gcp-tests.yml @@ -499,7 +499,10 @@ jobs: token_format: 'access_token' # Show all the logs since the container launched, - # following until Sapling activation (or the test finishes) + # following until Sapling activation (or the test finishes). + # + # The log pipeline ignores the exit status of `docker logs`. + # Errors in the tests are caught by the final test status job. - name: Show logs for ${{ inputs.test_id }} test (sprout) run: | gcloud compute ssh \ @@ -509,12 +512,11 @@ jobs: --ssh-flag="-o ServerAliveInterval=5" \ --command \ "\ - set -o pipefail; \ docker logs \ --tail all \ --follow \ ${{ inputs.test_id }} | \ - tee --output-error=exit-nopipe /dev/stderr | \ + tee --output-error=exit /dev/stderr | \ grep --max-count=1 --extended-regexp --color=always \ '(estimated progress.*network_upgrade.*=.*Sapling)|(test result:.*finished in)' \ " @@ -567,12 +569,11 @@ jobs: --ssh-flag="-o ServerAliveInterval=5" \ --command \ "\ - set -o pipefail; \ docker logs \ --tail ${{ env.EXTRA_LOG_LINES }} \ --follow \ ${{ inputs.test_id }} | \ - tee --output-error=exit-nopipe /dev/stderr | \ + tee --output-error=exit /dev/stderr | \ grep --max-count=1 --extended-regexp --color=always \ '(verified final checkpoint)|(test result:.*finished in)' \ " @@ -624,12 +625,11 @@ jobs: --ssh-flag="-o ServerAliveInterval=5" \ --command \ "\ - set -o pipefail; \ docker logs \ --tail ${{ env.EXTRA_LOG_LINES }} \ --follow \ ${{ inputs.test_id }} | \ - tee --output-error=exit-nopipe /dev/stderr | \ + tee --output-error=exit /dev/stderr | \ grep --max-count=1 --extended-regexp --color=always \ 'test result:.*finished in' \ "