From 474182a355a1d9ed38658c1e2c4b47a5badd8aa0 Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 22 Mar 2023 12:50:18 +1000 Subject: [PATCH] Split lightwalletd full sync time into two jobs (#6364) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .github/workflows/deploy-gcp-tests.yml | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy-gcp-tests.yml b/.github/workflows/deploy-gcp-tests.yml index 55918e534..acac6b589 100644 --- a/.github/workflows/deploy-gcp-tests.yml +++ b/.github/workflows/deploy-gcp-tests.yml @@ -822,7 +822,7 @@ jobs: grep --max-count=1 --extended-regexp --color=always \ -e 'estimated progress.*current_height.*=.*17[4-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'estimated progress.*current_height.*=.*1[8-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ - -e 'estimated progress.*current_height.*=.*2[0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ + -e 'estimated progress.*current_height.*=.*[2-9][0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'test result:.*finished in' \ " @@ -891,7 +891,7 @@ jobs: grep --max-count=1 --extended-regexp --color=always \ -e 'estimated progress.*current_height.*=.*17[6-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'estimated progress.*current_height.*=.*1[8-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ - -e 'estimated progress.*current_height.*=.*2[0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ + -e 'estimated progress.*current_height.*=.*[2-9][0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'test result:.*finished in' \ " @@ -960,7 +960,7 @@ jobs: grep --max-count=1 --extended-regexp --color=always \ -e 'estimated progress.*current_height.*=.*17[8-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'estimated progress.*current_height.*=.*1[8-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ - -e 'estimated progress.*current_height.*=.*2[0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ + -e 'estimated progress.*current_height.*=.*[2-9][0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'test result:.*finished in' \ " @@ -1029,7 +1029,7 @@ jobs: tee --output-error=exit /dev/stderr | \ grep --max-count=1 --extended-regexp --color=always \ -e 'estimated progress.*current_height.*=.*1[8-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ - -e 'estimated progress.*current_height.*=.*2[0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ + -e 'estimated progress.*current_height.*=.*[2-9][0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'test result:.*finished in' \ " @@ -1099,7 +1099,7 @@ jobs: grep --max-count=1 --extended-regexp --color=always \ -e 'estimated progress.*current_height.*=.*18[2-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'estimated progress.*current_height.*=.*19[0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ - -e 'estimated progress.*current_height.*=.*2[0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ + -e 'estimated progress.*current_height.*=.*[2-9][0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'test result:.*finished in' \ " @@ -1168,7 +1168,7 @@ jobs: grep --max-count=1 --extended-regexp --color=always \ -e 'estimated progress.*current_height.*=.*18[5-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'estimated progress.*current_height.*=.*19[0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ - -e 'estimated progress.*current_height.*=.*2[0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ + -e 'estimated progress.*current_height.*=.*[2-9][0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'test result:.*finished in' \ " @@ -1237,7 +1237,7 @@ jobs: grep --max-count=1 --extended-regexp --color=always \ -e 'estimated progress.*current_height.*=.*18[8-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'estimated progress.*current_height.*=.*19[0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ - -e 'estimated progress.*current_height.*=.*2[0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ + -e 'estimated progress.*current_height.*=.*[2-9][0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'test result:.*finished in' \ " @@ -1305,7 +1305,7 @@ jobs: tee --output-error=exit /dev/stderr | \ grep --max-count=1 --extended-regexp --color=always \ -e 'estimated progress.*current_height.*=.*19[2-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ - -e 'estimated progress.*current_height.*=.*2[0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ + -e 'estimated progress.*current_height.*=.*[2-9][0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'test result:.*finished in' \ " @@ -1373,11 +1373,12 @@ jobs: tee --output-error=exit /dev/stderr | \ grep --max-count=1 --extended-regexp --color=always \ -e 'estimated progress.*current_height.*=.*19[6-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ - -e 'estimated progress.*current_height.*=.*2[0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ + -e 'estimated progress.*current_height.*=.*[2-9][0-9][0-9][0-9][0-9][0-9][0-9].*remaining_sync_blocks' \ -e 'test result:.*finished in' \ " - # follow the logs of the test we just launched, up to the last checkpoint (or the test finishing) + # follow the logs of the test we just launched, up to the last checkpoint, or the test finishing, + # or for lightwalletd tests, about 5 hours into the full lightwalletd sync (block 1880k) logs-checkpoint: name: Log ${{ inputs.test_id }} test (checkpoint) needs: [ logs-1960k ] @@ -1421,7 +1422,7 @@ jobs: - name: Set up Cloud SDK uses: google-github-actions/setup-gcloud@v1.1.0 - # Show recent logs, following until the last checkpoint (or the test finishes) + # Show recent logs, following until the last checkpoint, or the test finishes, or 5 hours of lightwalletd sync (1880k) # # TODO: when doing obtain/extend tips, log the verifier in use, and check for full verification here - name: Show logs for ${{ inputs.test_id }} test (checkpoint) @@ -1440,6 +1441,9 @@ jobs: tee --output-error=exit /dev/stderr | \ grep --max-count=1 --extended-regexp --color=always \ -e 'verified final checkpoint' \ + -e 'lightwalletd.*Adding block to cache 18[8-9][0-9][0-9][0-9][0-9]' \ + -e 'lightwalletd.*Adding block to cache 19[0-9][0-9][0-9][0-9][0-9]' \ + -e 'lightwalletd.*Adding block to cache [2-9][0-9][0-9][0-9][0-9][0-9][0-9]' \ -e 'test result:.*finished in' \ "