Skip to content

Commit 3cae5e9

Browse files
committed
Merge branch 'feature/edgezero-pr18-phase5-verification' into feature/edgezero-pr19-spin-adapter
# Conflicts: # crates/trusted-server-integration-tests/Cargo.lock
2 parents f379567 + 262d47d commit 3cae5e9

3 files changed

Lines changed: 158 additions & 190 deletions

File tree

.github/workflows/integration-tests.yml

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -109,50 +109,6 @@ jobs:
109109
INTEGRATION_ORIGIN_PORT: ${{ env.ORIGIN_PORT }}
110110
RUST_LOG: info
111111

112-
integration-tests-edgezero:
113-
name: integration tests (EdgeZero entry point)
114-
needs: prepare-artifacts
115-
runs-on: ubuntu-latest
116-
timeout-minutes: 15
117-
steps:
118-
- uses: actions/checkout@v4
119-
120-
- name: Set up integration test runtime
121-
id: shared-setup
122-
uses: ./.github/actions/setup-integration-test-env
123-
with:
124-
origin-port: ${{ env.ORIGIN_PORT }}
125-
check-dependency-versions: "false"
126-
install-viceroy: "true"
127-
build-wasm: "false"
128-
build-test-images: "false"
129-
130-
- name: Download integration test artifacts
131-
uses: actions/download-artifact@v4
132-
with:
133-
name: integration-test-artifacts
134-
path: ${{ env.ARTIFACTS_DIR }}
135-
136-
# Exercises the EdgeZero entry point against the same WASM binary by
137-
# pointing Viceroy at a config store with `edgezero_enabled = "true"`.
138-
# Scoped to the container-free EC lifecycle suite (minimal TCP origin), a
139-
# focused parity subset covering Fastly request conversion, config-store
140-
# dispatch, publisher fallback proxying, and end-to-end EC/API wiring on
141-
# the EdgeZero path. The legacy `integration-tests` job above still covers
142-
# the full framework matrix.
143-
- name: Run EdgeZero EC lifecycle tests
144-
run: >-
145-
cargo test
146-
--manifest-path crates/trusted-server-integration-tests/Cargo.toml
147-
--target x86_64-unknown-linux-gnu
148-
test_ec_lifecycle_fastly
149-
-- --include-ignored --test-threads=1
150-
env:
151-
WASM_BINARY_PATH: ${{ env.WASM_ARTIFACT_PATH }}
152-
INTEGRATION_ORIGIN_PORT: ${{ env.ORIGIN_PORT }}
153-
VICEROY_CONFIG_PATH: ${{ github.workspace }}/crates/trusted-server-integration-tests/fixtures/configs/viceroy-template-edgezero.toml
154-
RUST_LOG: info
155-
156112
integration-tests-edgezero:
157113
name: integration tests (EdgeZero entry point)
158114
needs: prepare-artifacts

0 commit comments

Comments
 (0)