From a8536882839065c3f0e60cce08acf00701113fe9 Mon Sep 17 00:00:00 2001 From: arya2 Date: Wed, 20 Sep 2023 15:43:41 -0400 Subject: [PATCH 1/4] shorten generate-checkpoints test ids --- .../workflows/continous-integration-docker.patch.yml | 4 ++-- .github/workflows/continous-integration-docker.yml | 10 +++++----- zebra-utils/README.md | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/continous-integration-docker.patch.yml b/.github/workflows/continous-integration-docker.patch.yml index 489d75b01b3..2e1bad0013d 100644 --- a/.github/workflows/continous-integration-docker.patch.yml +++ b/.github/workflows/continous-integration-docker.patch.yml @@ -93,8 +93,8 @@ jobs: steps: - run: 'echo "No build required"' - generate-checkpoints-mainnet: - name: Generate checkpoints mainnet / Run generate-checkpoints-mainnet test + gen-checkpoints-mainnet: + name: Generate checkpoints mainnet / Run gen-checkpoints-mainnet test runs-on: ubuntu-latest steps: - run: 'echo "No build required"' diff --git a/.github/workflows/continous-integration-docker.yml b/.github/workflows/continous-integration-docker.yml index 742c99b201f..61c1c8c7ef7 100644 --- a/.github/workflows/continous-integration-docker.yml +++ b/.github/workflows/continous-integration-docker.yml @@ -470,14 +470,14 @@ jobs: # # If the state version has changed, waits for the new cached state to be created. # Otherwise, if the state rebuild was skipped, runs immediately after the build job. - generate-checkpoints-mainnet: + gen-checkpoints-mainnet: name: Generate checkpoints mainnet needs: [ test-full-sync, get-available-disks ] uses: ./.github/workflows/deploy-gcp-tests.yml if: ${{ !cancelled() && !failure() && (fromJSON(needs.get-available-disks.outputs.zebra_tip_disk) || needs.test-full-sync.result == 'success') && github.event.inputs.regenerate-disks != 'true' && github.event.inputs.run-full-sync != 'true' && github.event.inputs.run-lwd-sync != 'true' }} with: app_name: zebrad - test_id: generate-checkpoints-mainnet + test_id: gen-checkpoints-mainnet test_description: Generate Zebra checkpoints on mainnet # TODO: update the test to use {{ input.network }} instead? test_variables: '-e NETWORK=Mainnet -e GENERATE_CHECKPOINTS_MAINNET=1 -e ZEBRA_FORCE_USE_COLOR=1 -e ZEBRA_CACHED_STATE_DIR=/var/cache/zebrad-cache' @@ -551,14 +551,14 @@ jobs: # # If the state version has changed, waits for the new cached state to be created. # Otherwise, if the state rebuild was skipped, runs immediately after the build job. - generate-checkpoints-testnet: + gen-checkpoints-testnet: name: Generate checkpoints testnet needs: [ test-full-sync-testnet, get-available-disks-testnet ] uses: ./.github/workflows/deploy-gcp-tests.yml if: ${{ !cancelled() && !failure() && (fromJSON(needs.get-available-disks-testnet.outputs.zebra_tip_disk) || needs.test-full-sync-testnet.result == 'success') && github.event.inputs.regenerate-disks != 'true' && github.event.inputs.run-full-sync != 'true' && github.event.inputs.run-lwd-sync != 'true' }} with: app_name: zebrad - test_id: generate-checkpoints-testnet + test_id: gen-checkpoints-testnet test_description: Generate Zebra checkpoints on testnet test_variables: '-e NETWORK=Testnet -e GENERATE_CHECKPOINTS_TESTNET=1 -e ZEBRA_FORCE_USE_COLOR=1 -e ZEBRA_CACHED_STATE_DIR=/var/cache/zebrad-cache' network: "Testnet" @@ -789,7 +789,7 @@ jobs: # # This list is for reliable tests that are run on the `main` branch. # Testnet jobs are not in this list, because we expect testnet to fail occasionally. - needs: [ regenerate-stateful-disks, test-full-sync, lightwalletd-full-sync, test-all, test-all-getblocktemplate-rpcs, test-fake-activation-heights, test-empty-sync, test-lightwalletd-integration, test-configuration-file, test-zebra-conf-path, test-stateful-sync, test-update-sync, generate-checkpoints-mainnet, lightwalletd-update-sync, lightwalletd-rpc-test, lightwalletd-transactions-test, lightwalletd-grpc-test, get-block-template-test, submit-block-test ] + needs: [ regenerate-stateful-disks, test-full-sync, lightwalletd-full-sync, test-all, test-all-getblocktemplate-rpcs, test-fake-activation-heights, test-empty-sync, test-lightwalletd-integration, test-configuration-file, test-zebra-conf-path, test-stateful-sync, test-update-sync, gen-checkpoints-mainnet, lightwalletd-update-sync, lightwalletd-rpc-test, lightwalletd-transactions-test, lightwalletd-grpc-test, get-block-template-test, submit-block-test ] # Only open tickets for failed scheduled jobs, manual workflow runs, or `main` branch merges. # (PR statuses are already reported in the PR jobs list, and checked by Mergify.) # TODO: if a job times out, we want to create a ticket. Does failure() do that? Or do we need cancelled()? diff --git a/zebra-utils/README.md b/zebra-utils/README.md index 0632aca83b9..af5adbe53ac 100644 --- a/zebra-utils/README.md +++ b/zebra-utils/README.md @@ -24,8 +24,8 @@ To find the latest checkpoints on the `main` branch: 1. Find the [latest completed `CI Docker` workflow run on `main`](https://github.com/ZcashFoundation/zebra/actions/workflows/continous-integration-docker.yml?query=branch%3Amain). Due to GitHub UI issues, some runs will show as waiting, cancelled, or failed, but the checkpoints have still been generated. -2. Go to the `Result of generate-checkpoints-mainnet` step in the - `Run generate-checkpoints-mainnet` job, in the `Generate checkpoints mainnet` job +2. Go to the `Result of gen-checkpoints-mainnet` step in the + `Run gen-checkpoints-mainnet` job, in the `Generate checkpoints mainnet` job 3. Scroll down until you see the list of checkpoints, it should start around line 200 4. Add those checkpoints to the end of `zebra-consensus/src/checkpoint/main-checkpoints.txt` 5. Repeat steps 2 to 4 for `testnet` From 7d0e6a0bd33252a07ca496dbeb36ec6e041ffd3d Mon Sep 17 00:00:00 2001 From: arya2 Date: Wed, 20 Sep 2023 15:43:56 -0400 Subject: [PATCH 2/4] shorten full-sync-to-tip test ids --- .../workflows/continous-integration-docker.patch-always.yml | 2 +- .github/workflows/continous-integration-docker.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continous-integration-docker.patch-always.yml b/.github/workflows/continous-integration-docker.patch-always.yml index ccda278dd70..e05c97f9d24 100644 --- a/.github/workflows/continous-integration-docker.patch-always.yml +++ b/.github/workflows/continous-integration-docker.patch-always.yml @@ -14,7 +14,7 @@ jobs: - run: 'echo "No build required"' test-full-sync: - name: Zebra tip / Run full-sync-to-tip test + name: Zebra tip / Run full-sync test runs-on: ubuntu-latest steps: - run: 'echo "No build required"' diff --git a/.github/workflows/continous-integration-docker.yml b/.github/workflows/continous-integration-docker.yml index 61c1c8c7ef7..bb74ccbf507 100644 --- a/.github/workflows/continous-integration-docker.yml +++ b/.github/workflows/continous-integration-docker.yml @@ -401,7 +401,7 @@ jobs: if: ${{ github.event_name == 'schedule' || !fromJSON(needs.get-available-disks.outputs.zebra_tip_disk) || (github.event.inputs.run-full-sync == 'true' && (inputs.network || vars.ZCASH_NETWORK) == 'Mainnet') }} with: app_name: zebrad - test_id: full-sync-to-tip + test_id: full-sync test_description: Test a full sync up to the tip # The value of FULL_SYNC_MAINNET_TIMEOUT_MINUTES is currently ignored. # TODO: update the test to use {{ input.network }} instead? @@ -512,7 +512,7 @@ jobs: if: ${{ (github.event_name == 'schedule' && vars.SCHEDULE_TESTNET_FULL_SYNC == 'true') || !fromJSON(needs.get-available-disks-testnet.outputs.zebra_tip_disk) || (github.event.inputs.run-full-sync == 'true' && (inputs.network || vars.ZCASH_NETWORK) == 'Testnet') }} with: app_name: zebrad - test_id: full-sync-to-tip-testnet + test_id: full-sync-testnet test_description: Test a full sync up to the tip on testnet # The value of FULL_SYNC_TESTNET_TIMEOUT_MINUTES is currently ignored. test_variables: '-e NETWORK=Testnet -e FULL_SYNC_TESTNET_TIMEOUT_MINUTES=0 -e ZEBRA_FORCE_USE_COLOR=1' From 35bdfd21c1f13ee43b4aaffd8dc9608255d198ae Mon Sep 17 00:00:00 2001 From: arya2 Date: Thu, 28 Sep 2023 21:32:39 -0400 Subject: [PATCH 3/4] Applies suggestions from code review --- .../workflows/continous-integration-docker.patch.yml | 4 ++-- .github/workflows/continous-integration-docker.yml | 10 +++++----- zebra-utils/README.md | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/continous-integration-docker.patch.yml b/.github/workflows/continous-integration-docker.patch.yml index 2e1bad0013d..4b9755519a7 100644 --- a/.github/workflows/continous-integration-docker.patch.yml +++ b/.github/workflows/continous-integration-docker.patch.yml @@ -93,8 +93,8 @@ jobs: steps: - run: 'echo "No build required"' - gen-checkpoints-mainnet: - name: Generate checkpoints mainnet / Run gen-checkpoints-mainnet test + checkpoints-mainnet: + name: Generate checkpoints mainnet / Run checkpoints-mainnet test runs-on: ubuntu-latest steps: - run: 'echo "No build required"' diff --git a/.github/workflows/continous-integration-docker.yml b/.github/workflows/continous-integration-docker.yml index bb74ccbf507..05be19b9fae 100644 --- a/.github/workflows/continous-integration-docker.yml +++ b/.github/workflows/continous-integration-docker.yml @@ -470,14 +470,14 @@ jobs: # # If the state version has changed, waits for the new cached state to be created. # Otherwise, if the state rebuild was skipped, runs immediately after the build job. - gen-checkpoints-mainnet: + checkpoints-mainnet: name: Generate checkpoints mainnet needs: [ test-full-sync, get-available-disks ] uses: ./.github/workflows/deploy-gcp-tests.yml if: ${{ !cancelled() && !failure() && (fromJSON(needs.get-available-disks.outputs.zebra_tip_disk) || needs.test-full-sync.result == 'success') && github.event.inputs.regenerate-disks != 'true' && github.event.inputs.run-full-sync != 'true' && github.event.inputs.run-lwd-sync != 'true' }} with: app_name: zebrad - test_id: gen-checkpoints-mainnet + test_id: checkpoints-mainnet test_description: Generate Zebra checkpoints on mainnet # TODO: update the test to use {{ input.network }} instead? test_variables: '-e NETWORK=Mainnet -e GENERATE_CHECKPOINTS_MAINNET=1 -e ZEBRA_FORCE_USE_COLOR=1 -e ZEBRA_CACHED_STATE_DIR=/var/cache/zebrad-cache' @@ -551,14 +551,14 @@ jobs: # # If the state version has changed, waits for the new cached state to be created. # Otherwise, if the state rebuild was skipped, runs immediately after the build job. - gen-checkpoints-testnet: + checkpoints-testnet: name: Generate checkpoints testnet needs: [ test-full-sync-testnet, get-available-disks-testnet ] uses: ./.github/workflows/deploy-gcp-tests.yml if: ${{ !cancelled() && !failure() && (fromJSON(needs.get-available-disks-testnet.outputs.zebra_tip_disk) || needs.test-full-sync-testnet.result == 'success') && github.event.inputs.regenerate-disks != 'true' && github.event.inputs.run-full-sync != 'true' && github.event.inputs.run-lwd-sync != 'true' }} with: app_name: zebrad - test_id: gen-checkpoints-testnet + test_id: checkpoints-testnet test_description: Generate Zebra checkpoints on testnet test_variables: '-e NETWORK=Testnet -e GENERATE_CHECKPOINTS_TESTNET=1 -e ZEBRA_FORCE_USE_COLOR=1 -e ZEBRA_CACHED_STATE_DIR=/var/cache/zebrad-cache' network: "Testnet" @@ -789,7 +789,7 @@ jobs: # # This list is for reliable tests that are run on the `main` branch. # Testnet jobs are not in this list, because we expect testnet to fail occasionally. - needs: [ regenerate-stateful-disks, test-full-sync, lightwalletd-full-sync, test-all, test-all-getblocktemplate-rpcs, test-fake-activation-heights, test-empty-sync, test-lightwalletd-integration, test-configuration-file, test-zebra-conf-path, test-stateful-sync, test-update-sync, gen-checkpoints-mainnet, lightwalletd-update-sync, lightwalletd-rpc-test, lightwalletd-transactions-test, lightwalletd-grpc-test, get-block-template-test, submit-block-test ] + needs: [ regenerate-stateful-disks, test-full-sync, lightwalletd-full-sync, test-all, test-all-getblocktemplate-rpcs, test-fake-activation-heights, test-empty-sync, test-lightwalletd-integration, test-configuration-file, test-zebra-conf-path, test-stateful-sync, test-update-sync, checkpoints-mainnet, lightwalletd-update-sync, lightwalletd-rpc-test, lightwalletd-transactions-test, lightwalletd-grpc-test, get-block-template-test, submit-block-test ] # Only open tickets for failed scheduled jobs, manual workflow runs, or `main` branch merges. # (PR statuses are already reported in the PR jobs list, and checked by Mergify.) # TODO: if a job times out, we want to create a ticket. Does failure() do that? Or do we need cancelled()? diff --git a/zebra-utils/README.md b/zebra-utils/README.md index af5adbe53ac..80aed60aae1 100644 --- a/zebra-utils/README.md +++ b/zebra-utils/README.md @@ -28,7 +28,7 @@ To find the latest checkpoints on the `main` branch: `Run gen-checkpoints-mainnet` job, in the `Generate checkpoints mainnet` job 3. Scroll down until you see the list of checkpoints, it should start around line 200 4. Add those checkpoints to the end of `zebra-consensus/src/checkpoint/main-checkpoints.txt` -5. Repeat steps 2 to 4 for `testnet` +5. Repeat steps 2 to 4 for `Generate checkpoints testnet` 6. Open a pull request at https://github.com/ZcashFoundation/zebra/pulls #### Manual Checkpoint Generation From 38bb99f27f1503a26bf5c2052dc2790b50091609 Mon Sep 17 00:00:00 2001 From: teor Date: Mon, 9 Oct 2023 08:32:08 +1000 Subject: [PATCH 4/4] Fix missed search and replace --- zebra-utils/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zebra-utils/README.md b/zebra-utils/README.md index 80aed60aae1..e8d625842c7 100644 --- a/zebra-utils/README.md +++ b/zebra-utils/README.md @@ -24,8 +24,8 @@ To find the latest checkpoints on the `main` branch: 1. Find the [latest completed `CI Docker` workflow run on `main`](https://github.com/ZcashFoundation/zebra/actions/workflows/continous-integration-docker.yml?query=branch%3Amain). Due to GitHub UI issues, some runs will show as waiting, cancelled, or failed, but the checkpoints have still been generated. -2. Go to the `Result of gen-checkpoints-mainnet` step in the - `Run gen-checkpoints-mainnet` job, in the `Generate checkpoints mainnet` job +2. Go to the `Result of checkpoints-mainnet` step in the + `Run checkpoints-mainnet` job, in the `Generate checkpoints mainnet` job 3. Scroll down until you see the list of checkpoints, it should start around line 200 4. Add those checkpoints to the end of `zebra-consensus/src/checkpoint/main-checkpoints.txt` 5. Repeat steps 2 to 4 for `Generate checkpoints testnet`