Skip to content

Commit ed7f157

Browse files
committed
Remove deprecated block-building and warp-sync test configurations
1 parent 3920174 commit ed7f157

21 files changed

+47
-471
lines changed

.github/scripts/dispatch-zombienet-workflow.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,12 @@ while [[ $MAX_RESULT_CNT -eq -1 || $RESULT_CNT -lt $MAX_RESULT_CNT ]]; do
111111
TRIGGER_CNT=$(( TRIGGER_CNT + 1 ))
112112
dbg "Triggering #$TRIGGER_CNT workflow $WORKFLOW_FILE (branch: $BRANCH)"
113113

114+
CMD_ARGS=(gh workflow run "$WORKFLOW_FILE" --ref "$BRANCH")
114115
if [[ -n "$TEST_PATTERN" ]]; then
115-
gh workflow run "$WORKFLOW_FILE" --ref "$BRANCH" -f test_pattern="$TEST_PATTERN"
116-
else
117-
gh workflow run "$WORKFLOW_FILE" --ref "$BRANCH"
116+
CMD_ARGS+=(-f "test_pattern=$TEST_PATTERN")
118117
fi
118+
dbg "Dispatch command: ${CMD_ARGS[*]}"
119+
"${CMD_ARGS[@]}"
119120

120121
dbg "Sleeping 60s"
121122
sleep 60

.github/workflows/zombienet-reusable-preflight.yml

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ on:
7575
value: ${{ jobs.preflight.outputs.SOURCE_REF_SLUG }}
7676

7777
BUILD_RUN_ID:
78-
value: ${{ inputs.build_run_id }}
78+
value: ${{ jobs.preflight.outputs.BUILD_RUN_ID }}
7979
description: |
8080
Id of the build run, needed to download the artifacts.
8181
@@ -193,6 +193,7 @@ jobs:
193193
ZOMBIENET_SDK_IMAGE: ${{ steps.set_vars.outputs.ZOMBIENET_SDK_IMAGE }}
194194
ZOMBIENET_SDK_DEFAULT_RUNNER: ${{ steps.set_vars.outputs.ZOMBIENET_SDK_DEFAULT_RUNNER }}
195195
ZOMBIENET_SDK_LARGE_RUNNER: ${{ steps.set_vars.outputs.ZOMBIENET_SDK_LARGE_RUNNER }}
196+
BUILD_RUN_ID: ${{ steps.determine_build.outputs.BUILD_RUN_ID }}
196197

197198
steps:
198199
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -235,6 +236,40 @@ jobs:
235236
- '.github/zombienet-env'
236237
- '.github/zombienet-flaky-tests'
237238
239+
- name: Determine build run id
240+
id: determine_build
241+
shell: bash
242+
env:
243+
PROVIDED_BUILD_RUN_ID: ${{ inputs.build_run_id }}
244+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
245+
REPO: ${{ github.repository }}
246+
BUILD_WORKFLOW_FILE: build-publish-images.yml
247+
BRANCH_REF: ${{ github.head_ref || github.ref_name }}
248+
run: |
249+
if [[ -n "$PROVIDED_BUILD_RUN_ID" ]]; then
250+
echo "Using provided build run ID: $PROVIDED_BUILD_RUN_ID"
251+
echo "BUILD_RUN_ID=$PROVIDED_BUILD_RUN_ID" >> "$GITHUB_OUTPUT"
252+
exit 0
253+
fi
254+
255+
echo "Auto-detecting build run ID for ${BUILD_WORKFLOW_FILE} on branch ${BRANCH_REF}"
256+
RUNS_JSON=$(gh run list --workflow="${BUILD_WORKFLOW_FILE}" -b "${BRANCH_REF}" -L 20 --json databaseId,status,conclusion,createdAt || true)
257+
258+
if [[ -z "$RUNS_JSON" || "$RUNS_JSON" == "[]" ]]; then
259+
echo "::error::Unable to retrieve runs for ${BUILD_WORKFLOW_FILE} on branch ${BRANCH_REF}"
260+
exit 1
261+
fi
262+
263+
RUN_ID=$(echo "$RUNS_JSON" | jq -r '[.[] | select(.status == "completed" and .conclusion == "success")] | first | .databaseId // empty')
264+
265+
if [[ -z "$RUN_ID" ]]; then
266+
echo "::error::Unable to find successful ${BUILD_WORKFLOW_FILE} run for branch ${BRANCH_REF}"
267+
exit 1
268+
fi
269+
270+
echo "Found build run ID: $RUN_ID"
271+
echo "BUILD_RUN_ID=$RUN_ID" >> "$GITHUB_OUTPUT"
272+
238273
#
239274
# Set environment vars (including runner/image)
240275
#

.github/workflows/zombienet_substrate.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,6 @@ jobs:
8787
shell: bash
8888
run: ${{ matrix.test.additional-setup }}
8989

90-
- name: zombienet_test (v1)
91-
if: ${{ !matrix.test.use-zombienet-sdk }}
92-
timeout-minutes: 60
93-
uses: ./.github/actions/zombienet
94-
with:
95-
test-definition: ${{ matrix.test.test-definition }}
96-
job-name: ${{ matrix.test.job-name }}
97-
local-dir: ${{ matrix.test.local-dir }}
98-
concurrency: ${{ matrix.test.concurrency || 1 }}
99-
gh-token: ${{ secrets.GITHUB_TOKEN }}
100-
build-id: ${{ needs.preflight.outputs.BUILD_RUN_ID }}
101-
ref-slug: ${{ needs.preflight.outputs.SOURCE_REF_SLUG }}
102-
10390
- name: zombienet_test (sdk)
10491
if: ${{ matrix.test.use-zombienet-sdk }}
10592
uses: ./.github/actions/zombienet-sdk

substrate/zombienet/0000-block-building/block-building.toml

Lines changed: 0 additions & 15 deletions
This file was deleted.

substrate/zombienet/0000-block-building/block-building.zndsl

Lines changed: 0 additions & 17 deletions
This file was deleted.

substrate/zombienet/0000-block-building/transaction-gets-finalized.js

Lines changed: 0 additions & 59 deletions
This file was deleted.

substrate/zombienet/0001-basic-warp-sync/README.md

Lines changed: 0 additions & 99 deletions
This file was deleted.

substrate/zombienet/0001-basic-warp-sync/generate-warp-sync-database.toml

Lines changed: 0 additions & 20 deletions
This file was deleted.

substrate/zombienet/0001-basic-warp-sync/test-warp-sync.toml

Lines changed: 0 additions & 30 deletions
This file was deleted.

substrate/zombienet/0001-basic-warp-sync/test-warp-sync.zndsl

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)