Skip to content

fix(ci): address ZSA integration CI issues#10735

Merged
oxarbitrage merged 32 commits into
ZcashFoundation:zsa-supportfrom
QED-it:sync-zcash-v4.2.0-merge
Jun 25, 2026
Merged

fix(ci): address ZSA integration CI issues#10735
oxarbitrage merged 32 commits into
ZcashFoundation:zsa-supportfrom
QED-it:sync-zcash-v4.2.0-merge

Conversation

@dmidem

@dmidem dmidem commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

This is a technical ZSA follow-up PR that brings the remaining CI-related fixes so they can be validated in the ZcashFoundation CI environment.

Motivation

We need the upstream Zebra CI scripts to run correctly for the agreed ZSA validation workflow.

The current CI configuration still assumes PRs target main, but the ZSA validation flow uses the temporary integration branches zsa-support and v4.2.0-dev. Because of that, some checks were not triggered.

There are also CI compatibility issues in the current validation setup: some jobs depend on moving stable / nightly toolchains, and the QEDIT-added basic checks need small fixes to behave reliably in the ZcashFoundation CI environment.

Solution

This PR updates CI configuration to:

  • allow the relevant PR workflows to run for zsa-support and v4.2.0-dev;
  • keep push triggers limited to main;
  • keep the ZSA branch triggers marked as temporary;
  • pin toolchains/actions where needed for the current Zebra v4.2.0 CI validation;
  • make additional improvements to the QEDIT-added internal CI checks, which are only used for ZSA validation and are not intended to be merged to upstream main.

These changes are intended to validate the ZSA integration in the ZcashFoundation CI environment without changing the ZSA feature scope.

Notes

The temporary ZSA CI branch triggers, toolchain pins, and retry are marked with TODOs and should be removed before merging to main.

AI Disclosure

  • AI tools were used: ChatGPT was used for wording and CI review assistance.

dmidem and others added 30 commits June 1, 2026 21:38
* Add ECR and ECS pipelines to zsa1 branch

* Create stop-ecs.yaml

* Moce stop ECS to correct directory (rename)

* Deploy ECS fixes

* Deploy push ECR fixes

* Add stop ecs fixes

* Change to any tag

---------

Co-authored-by: ronkq <ronkq@users.noreply.github.com>
Co-authored-by: a <github@github.com>
push-ecr.yaml was pointing at docker/Dockerfile (the upstream mainnet
image) instead of testnet-single-node-deploy/dockerfile (the regtest
image used by tx-tool). The ECS node was syncing mainnet from genesis,
causing tx-tool to fail with exit code 101.

Co-authored-by: ronkq <github@github.com>
@dmidem dmidem changed the title fix(ci): address remaining ZSA CI issues fix(ci): address ZSA integration CI issues Jun 18, 2026
Comment thread .github/workflows/stop-ecs.yaml Fixed
Comment thread .github/workflows/deploy-ecs.yaml Fixed
Comment thread .github/workflows/deploy-ecs.yaml Fixed
Comment thread .github/workflows/deploy-ecs.yaml Fixed
Comment thread .github/workflows/push-ecr.yaml Fixed
Comment thread .github/workflows/push-ecr.yaml Fixed
Comment thread .github/workflows/push-ecr.yaml Fixed
Comment thread .github/workflows/deploy-ecs.yaml Fixed
Comment thread .github/workflows/deploy-ecs.yaml Fixed
Comment thread .github/workflows/stop-ecs.yaml Fixed
@oxarbitrage
oxarbitrage marked this pull request as ready for review June 24, 2026 13:56
@oxarbitrage oxarbitrage added the run-stateful-tests Allos to manually trigger a stateful tests run in GCP in PRs label Jun 24, 2026
@oxarbitrage
oxarbitrage merged commit 6493603 into ZcashFoundation:zsa-support Jun 25, 2026
66 of 67 checks passed
@mergify

mergify Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

⚠️ The sha of the head commit of this PR conflicts with #10628. Mergify cannot evaluate rules on this PR. Once #10628 is merged or closed, Mergify will resume processing this PR. ⚠️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

external-contribution run-stateful-tests Allos to manually trigger a stateful tests run in GCP in PRs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants