Skip to content

Commit 47eef75

Browse files
pepoviolaalvicsam
pepoviola
authored and
alvicsam
committed
[zombienet] fix ci for new runners (#8876)
Add needed env vars to run with the new runners (polkadot workflow) and move cumulus/substrate to zombienet action.
1 parent 204298f commit 47eef75

File tree

3 files changed

+84
-158
lines changed

3 files changed

+84
-158
lines changed

‎.github/workflows/zombienet_cumulus.yml‎

Lines changed: 51 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,13 @@ jobs:
7474
- name: Checkout
7575
uses: actions/checkout@v4
7676

77-
- name: script
78-
run: |
79-
echo "RELAY_IMAGE: $RELAY_IMAGE"
80-
echo "COL_IMAGE: $COL_IMAGE"
81-
export DEBUG=${{ needs.preflight.outputs.DEBUG }}
82-
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
83-
--local-dir="$(pwd)/$LOCAL_DIR" \
84-
--concurrency=1 \
85-
--test="0002-pov_recovery.zndsl"
86-
87-
- name: upload logs
88-
uses: actions/upload-artifact@v4
77+
#
78+
- name: zombienet_test
79+
uses: ./.github/actions/zombienet
8980
with:
90-
name: zombienet-logs-${{ github.job }}-${{ github.sha }}
91-
path: |
92-
/tmp/zombie*/logs/*
81+
test: "0002-pov_recovery.zndsl"
82+
local-dir: "${{ env.LOCAL_DIR }}"
83+
concurrency: 1
9384

9485
zombienet-cumulus-0003-full_node_catching_up:
9586
needs: [preflight]
@@ -105,22 +96,13 @@ jobs:
10596
- name: Checkout
10697
uses: actions/checkout@v4
10798

108-
- name: script
109-
run: |
110-
echo "RELAY_IMAGE: $RELAY_IMAGE"
111-
echo "COL_IMAGE: $COL_IMAGE"
112-
export DEBUG=${{ needs.preflight.outputs.DEBUG }}
113-
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
114-
--local-dir="$(pwd)/$LOCAL_DIR" \
115-
--concurrency=1 \
116-
--test="0003-full_node_catching_up.zndsl"
117-
118-
- name: upload logs
119-
uses: actions/upload-artifact@v4
99+
#
100+
- name: zombienet_test
101+
uses: ./.github/actions/zombienet
120102
with:
121-
name: zombienet-logs-${{ github.job }}-${{ github.sha }}
122-
path: |
123-
/tmp/zombie*/logs/*
103+
test: "0003-full_node_catching_up.zndsl"
104+
local-dir: "${{ env.LOCAL_DIR }}"
105+
concurrency: 1
124106

125107
zombienet-cumulus-0004-runtime_upgrade:
126108
needs: [preflight]
@@ -145,25 +127,20 @@ jobs:
145127
- name: tar
146128
run: tar -xvf artifacts.tar
147129

148-
- name: script
130+
- name: cp
131+
shell: bash
149132
run: |
150-
echo "RELAY_IMAGE: $RELAY_IMAGE"
151-
echo "COL_IMAGE: $COL_IMAGE"
152133
ls -ltr *
153134
cp ./artifacts/zombienet/wasm_binary_spec_version_incremented.rs.compact.compressed.wasm /tmp/
154135
ls /tmp
155-
export DEBUG=${{ needs.preflight.outputs.DEBUG }}
156-
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
157-
--local-dir="$(pwd)/$LOCAL_DIR" \
158-
--concurrency=1 \
159-
--test="0004-runtime_upgrade.zndsl"
160136
161-
- name: upload logs
162-
uses: actions/upload-artifact@v4
137+
#
138+
- name: zombienet_test
139+
uses: ./.github/actions/zombienet
163140
with:
164-
name: zombienet-logs-${{ github.job }}-${{ github.sha }}
165-
path: |
166-
/tmp/zombie*/logs/*
141+
test: "0004-runtime_upgrade.zndsl"
142+
local-dir: "${{ env.LOCAL_DIR }}"
143+
concurrency: 1
167144

168145
zombienet-cumulus-0005-migrate_solo_to_para:
169146
needs: [preflight]
@@ -179,22 +156,13 @@ jobs:
179156
- name: Checkout
180157
uses: actions/checkout@v4
181158

182-
- name: script
183-
run: |
184-
echo "RELAY_IMAGE: $RELAY_IMAGE"
185-
echo "COL_IMAGE: $COL_IMAGE"
186-
export DEBUG=${{ needs.preflight.outputs.DEBUG }}
187-
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
188-
--local-dir="$(pwd)/$LOCAL_DIR" \
189-
--concurrency=1 \
190-
--test="0005-migrate_solo_to_para.zndsl"
191-
192-
- name: upload logs
193-
uses: actions/upload-artifact@v4
159+
#
160+
- name: zombienet_test
161+
uses: ./.github/actions/zombienet
194162
with:
195-
name: zombienet-logs-${{ github.job }}-${{ github.sha }}
196-
path: |
197-
/tmp/zombie*/logs/*
163+
test: "0005-migrate_solo_to_para.zndsl"
164+
local-dir: "${{ env.LOCAL_DIR }}"
165+
concurrency: 1
198166

199167
zombienet-cumulus-0006-rpc_collator_builds_blocks:
200168
needs: [preflight]
@@ -210,22 +178,13 @@ jobs:
210178
- name: Checkout
211179
uses: actions/checkout@v4
212180

213-
- name: script
214-
run: |
215-
echo "RELAY_IMAGE: $RELAY_IMAGE"
216-
echo "COL_IMAGE: $COL_IMAGE"
217-
export DEBUG=${{ needs.preflight.outputs.DEBUG }}
218-
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
219-
--local-dir="$(pwd)/$LOCAL_DIR" \
220-
--concurrency=1 \
221-
--test="0006-rpc_collator_builds_blocks.zndsl"
222-
223-
- name: upload logs
224-
uses: actions/upload-artifact@v4
181+
#
182+
- name: zombienet_test
183+
uses: ./.github/actions/zombienet
225184
with:
226-
name: zombienet-logs-${{ github.job }}-${{ github.sha }}
227-
path: |
228-
/tmp/zombie*/logs/*
185+
test: "0006-rpc_collator_builds_blocks.zndsl"
186+
local-dir: "${{ env.LOCAL_DIR }}"
187+
concurrency: 1
229188

230189
zombienet-cumulus-0007-full_node_warp_sync:
231190
needs: [preflight]
@@ -241,22 +200,14 @@ jobs:
241200
- name: Checkout
242201
uses: actions/checkout@v4
243202

244-
- name: script
245-
run: |
246-
echo "RELAY_IMAGE: $RELAY_IMAGE"
247-
echo "COL_IMAGE: $COL_IMAGE"
248-
export DEBUG=${{ needs.preflight.outputs.DEBUG }}
249-
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
250-
--local-dir="$(pwd)/$LOCAL_DIR" \
251-
--concurrency=1 \
252-
--test="0007-full_node_warp_sync.zndsl"
253-
254-
- name: upload logs
255-
uses: actions/upload-artifact@v4
203+
#
204+
- name: zombienet_test
205+
uses: ./.github/actions/zombienet
256206
with:
257-
name: zombienet-logs-${{ github.job }}-${{ github.sha }}
258-
path: |
259-
/tmp/zombie*/logs/*
207+
test: "0007-full_node_warp_sync.zndsl"
208+
local-dir: "${{ env.LOCAL_DIR }}"
209+
concurrency: 1
210+
260211

261212
zombienet-cumulus-0008-elastic_authoring:
262213
needs: [preflight]
@@ -272,22 +223,13 @@ jobs:
272223
- name: Checkout
273224
uses: actions/checkout@v4
274225

275-
- name: script
276-
run: |
277-
echo "RELAY_IMAGE: $RELAY_IMAGE"
278-
echo "COL_IMAGE: $COL_IMAGE"
279-
export DEBUG=${{ needs.preflight.outputs.DEBUG }}
280-
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
281-
--local-dir="$(pwd)/$LOCAL_DIR" \
282-
--concurrency=1 \
283-
--test="0008-elastic_authoring.zndsl"
284-
285-
- name: upload logs
286-
uses: actions/upload-artifact@v4
226+
#
227+
- name: zombienet_test
228+
uses: ./.github/actions/zombienet
287229
with:
288-
name: zombienet-logs-${{ github.job }}-${{ github.sha }}
289-
path: |
290-
/tmp/zombie*/logs/*
230+
test: "0008-elastic_authoring.zndsl"
231+
local-dir: "${{ env.LOCAL_DIR }}"
232+
concurrency: 1
291233

292234
zombienet-cumulus-0009-elastic_pov_recovery:
293235
needs: [preflight]
@@ -303,22 +245,13 @@ jobs:
303245
- name: Checkout
304246
uses: actions/checkout@v4
305247

306-
- name: script
307-
run: |
308-
echo "RELAY_IMAGE: $RELAY_IMAGE"
309-
echo "COL_IMAGE: $COL_IMAGE"
310-
export DEBUG=${{ needs.preflight.outputs.DEBUG }}
311-
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
312-
--local-dir="$(pwd)/$LOCAL_DIR" \
313-
--concurrency=1 \
314-
--test="0009-elastic_pov_recovery.zndsl"
315-
316-
- name: upload logs
317-
uses: actions/upload-artifact@v4
248+
#
249+
- name: zombienet_test
250+
uses: ./.github/actions/zombienet
318251
with:
319-
name: zombienet-logs-${{ github.job }}-${{ github.sha }}
320-
path: |
321-
/tmp/zombie*/logs/*
252+
test: "0009-elastic_pov_recovery.zndsl"
253+
local-dir: "${{ env.LOCAL_DIR }}"
254+
concurrency: 1
322255

323256
zombienet-cumulus-0010-elastic_scaling_multiple_block_per_slot:
324257
needs: [preflight]

‎.github/workflows/zombienet_polkadot.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ env:
2121
X_INFRA_INSTANCE: "spot"
2222
# don't retry sdk tests
2323
NEXTEST_RETRIES: 0
24+
KUBECONFIG: "/data/config"
25+
ZOMBIE_CLEANER_DISABLED: 1
2426

2527
# only run if we have changes in [subtrate, polkadot] directories or this workflow.
2628
jobs:

‎.github/workflows/zombienet_substrate.yml‎

Lines changed: 31 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,14 @@ jobs:
5252
- name: Checkout
5353
uses: actions/checkout@v4
5454

55-
- name: script
56-
run: |
57-
echo "Img: $ZOMBIENET_INTEGRATION_TEST_IMAGE"
58-
export DEBUG=${{ needs.preflight.outputs.DEBUG }}
59-
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="$(pwd)/$LOCAL_DIR/0000-block-building" --test="block-building.zndsl"
60-
61-
- name: upload logs
62-
uses: actions/upload-artifact@v4
55+
#
56+
- name: zombienet_test
57+
uses: ./.github/actions/zombienet
6358
with:
64-
name: zombienet-logs-${{ github.job }}-${{ github.sha }}
65-
path: |
66-
/tmp/zombie*/logs/*
59+
test: "block-building.zndsl"
60+
local-dir: "${{ env.LOCAL_DIR }}/0000-block-building"
61+
concurrency: 1
62+
6763

6864
zombienet-substrate-0001-basic-warp-sync:
6965
needs: [preflight]
@@ -79,18 +75,14 @@ jobs:
7975
- name: Checkout
8076
uses: actions/checkout@v4
8177

82-
- name: script
83-
run: |
84-
echo "Img: $ZOMBIENET_INTEGRATION_TEST_IMAGE"
85-
export DEBUG=${{ needs.preflight.outputs.DEBUG }}
86-
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="$(pwd)/$LOCAL_DIR/0001-basic-warp-sync" --test="test-warp-sync.zndsl"
87-
88-
- name: upload logs
89-
uses: actions/upload-artifact@v4
78+
#
79+
- name: zombienet_test
80+
uses: ./.github/actions/zombienet
9081
with:
91-
name: zombienet-logs-${{ github.job }}-${{ github.sha }}
92-
path: |
93-
/tmp/zombie*/logs/*
82+
test: "test-warp-sync.zndsl"
83+
local-dir: "${{ env.LOCAL_DIR }}/0001-basic-warp-sync"
84+
concurrency: 1
85+
9486

9587
zombienet-substrate-0002-validators-warp-sync:
9688
needs: [preflight]
@@ -106,19 +98,18 @@ jobs:
10698
- name: Checkout
10799
uses: actions/checkout@v4
108100

109-
- name: script
101+
- name: cp
102+
shell: bash
110103
run: |
111-
echo "Img: $ZOMBIENET_INTEGRATION_TEST_IMAGE"
112104
cp --remove-destination ${LOCAL_DIR}/0001-basic-warp-sync/chain-spec.json ${LOCAL_DIR}/0002-validators-warp-sync
113-
export DEBUG=${{ needs.preflight.outputs.DEBUG }}
114-
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="$(pwd)/$LOCAL_DIR/0002-validators-warp-sync" --test="test-validators-warp-sync.zndsl"
115105
116-
- name: upload logs
117-
uses: actions/upload-artifact@v4
106+
#
107+
- name: zombienet_test
108+
uses: ./.github/actions/zombienet
118109
with:
119-
name: zombienet-logs-${{ github.job }}-${{ github.sha }}
120-
path: |
121-
/tmp/zombie*/logs/*
110+
test: "test-validators-warp-sync.zndsl"
111+
local-dir: "${{ env.LOCAL_DIR }}/0002-validators-warp-sync"
112+
concurrency: 1
122113

123114
zombienet-substrate-0003-block-building-warp-sync:
124115
needs: [preflight]
@@ -134,16 +125,16 @@ jobs:
134125
- name: Checkout
135126
uses: actions/checkout@v4
136127

137-
- name: script
128+
- name: cp
129+
shell: bash
138130
run: |
139-
echo "Img: $ZOMBIENET_INTEGRATION_TEST_IMAGE"
140131
cp --remove-destination ${LOCAL_DIR}/0001-basic-warp-sync/chain-spec.json ${LOCAL_DIR}/0003-block-building-warp-sync
141-
export DEBUG=${{ needs.preflight.outputs.DEBUG }}
142-
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="$(pwd)/$LOCAL_DIR/0003-block-building-warp-sync" --test="test-block-building-warp-sync.zndsl"
143132
144-
- name: upload logs
145-
uses: actions/upload-artifact@v4
133+
#
134+
- name: zombienet_test
135+
uses: ./.github/actions/zombienet
146136
with:
147-
name: zombienet-logs-${{ github.job }}-${{ github.sha }}
148-
path: |
149-
/tmp/zombie*/logs/*
137+
test: "test-block-building-warp-sync.zndsl"
138+
local-dir: "${{ env.LOCAL_DIR }}/0003-block-building-warp-sync"
139+
concurrency: 1
140+

0 commit comments

Comments
 (0)