Skip to content

Commit c54e68f

Browse files
muharemmuharem
authored
Merge branch 'master' into muharem-meta-tx
2 parents c53c820 + e9a15dc commit c54e68f

File tree

135 files changed

+2961
-1102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+2961
-1102
lines changed

‎.github/workflows/build-publish-images.yml

+63
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,9 @@ jobs:
266266
path: artifacts.tar
267267
retention-days: 1
268268

269+
270+
### Build zombienet test artifacts ########################
271+
269272
#
270273
#
271274
#
@@ -296,6 +299,66 @@ jobs:
296299
path: artifacts.tar
297300
retention-days: 1
298301

302+
#
303+
#
304+
#
305+
prepare-polkadot-zombienet-artifacts:
306+
needs: [preflight]
307+
runs-on: ${{ needs.preflight.outputs.RUNNER }}
308+
timeout-minutes: 60
309+
container:
310+
image: ${{ needs.preflight.outputs.IMAGE }}
311+
steps:
312+
- name: Checkout
313+
uses: actions/checkout@v4
314+
- name: build
315+
run: |
316+
forklift cargo nextest --manifest-path polkadot/zombienet-sdk-tests/Cargo.toml archive --locked --features zombie-metadata --archive-file polkadot-zombienet-tests.tar.zst
317+
- name: pack artifacts
318+
run: |
319+
mkdir -p artifacts
320+
cp polkadot-zombienet-tests.tar.zst ./artifacts
321+
322+
- name: tar
323+
run: tar -cvf artifacts.tar artifacts
324+
325+
- name: upload artifacts
326+
uses: actions/upload-artifact@v4
327+
with:
328+
name: ${{ github.job }}-${{ needs.preflight.outputs.SOURCE_REF_SLUG }}
329+
path: artifacts.tar
330+
retention-days: 1
331+
332+
#
333+
#
334+
#
335+
prepare-cumulus-zombienet-artifacts:
336+
needs: [preflight]
337+
runs-on: ${{ needs.preflight.outputs.RUNNER }}
338+
timeout-minutes: 60
339+
container:
340+
image: ${{ needs.preflight.outputs.IMAGE }}
341+
steps:
342+
- name: Checkout
343+
uses: actions/checkout@v4
344+
- name: build
345+
run: |
346+
forklift cargo nextest --manifest-path cumulus/zombienet/zombienet-sdk/Cargo.toml archive --locked --features zombie-ci --archive-file cumulus-zombienet-tests.tar.zst
347+
- name: pack artifacts
348+
run: |
349+
mkdir -p artifacts
350+
cp cumulus-zombienet-tests.tar.zst ./artifacts
351+
352+
- name: tar
353+
run: tar -cvf artifacts.tar artifacts
354+
355+
- name: upload artifacts
356+
uses: actions/upload-artifact@v4
357+
with:
358+
name: ${{ github.job }}-${{ needs.preflight.outputs.SOURCE_REF_SLUG }}
359+
path: artifacts.tar
360+
retention-days: 1
361+
299362
### Publish ########################
300363

301364
#

‎.github/workflows/release-30_publish_release_draft.yml

+3-13
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,6 @@ jobs:
3939
RELEASE_TAG=$(validate_stable_tag ${{ inputs.release_tag }})
4040
echo "release_tag=${RELEASE_TAG}" >> $GITHUB_OUTPUT
4141
42-
get-rust-versions:
43-
needs: [ validate-inputs ]
44-
runs-on: ubuntu-latest
45-
outputs:
46-
rustc-stable: ${{ steps.get-rust-versions.outputs.stable }}
47-
steps:
48-
- id: get-rust-versions
49-
run: |
50-
RUST_STABLE_VERSION=$(curl -sS https://raw.githubusercontent.com/paritytech/scripts/master/dockerfiles/ci-unified/Dockerfile | grep -oP 'ARG RUST_STABLE_VERSION=\K[^ ]+')
51-
echo "stable=$RUST_STABLE_VERSION" >> $GITHUB_OUTPUT
52-
5342
build-runtimes:
5443
needs: [ validate-inputs ]
5544
uses: "./.github/workflows/release-srtool.yml"
@@ -65,7 +54,7 @@ jobs:
6554
publish-release-draft:
6655
runs-on: ubuntu-latest
6756
environment: release
68-
needs: [ validate-inputs, get-rust-versions, build-runtimes ]
57+
needs: [ validate-inputs, build-runtimes ]
6958
outputs:
7059
release_url: ${{ steps.create-release.outputs.html_url }}
7160
asset_upload_url: ${{ steps.create-release.outputs.upload_url }}
@@ -86,7 +75,6 @@ jobs:
8675
- name: Prepare draft
8776
id: draft
8877
env:
89-
RUSTC_STABLE: ${{ needs.get-rust-versions.outputs.rustc-stable }}
9078
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9179
ASSET_HUB_WESTEND_DIGEST: ${{ github.workspace}}/asset-hub-westend-runtime/asset-hub-westend-srtool-digest.json
9280
BRIDGE_HUB_WESTEND_DIGEST: ${{ github.workspace}}/bridge-hub-westend-runtime/bridge-hub-westend-srtool-digest.json
@@ -100,6 +88,8 @@ jobs:
10088
run: |
10189
. ./.github/scripts/common/lib.sh
10290
91+
export RUSTC_STABLE=$(grep -oP '(?<=-)[0-9]+\.[0-9]+\.[0-9]+(?=-)' .github/env)
92+
10393
export REF1=$(get_latest_release_tag)
10494
if [[ -z "$RELEASE_TAG" ]]; then
10595
export REF2="${{ github.ref_name }}"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ jobs:
220220
wait_build_images:
221221
needs: [ci-env]
222222
runs-on: ubuntu-latest
223-
timeout-minutes: 30
223+
timeout-minutes: 60
224224
outputs:
225225
BUILD_RUN_ID: ${{ steps.wait_build.outputs.BUILD_RUN_ID }}
226226
steps:

‎.github/workflows/zombienet_cumulus.yml

+54
Original file line numberDiff line numberDiff line change
@@ -315,3 +315,57 @@ jobs:
315315
name: zombienet-logs-${{ github.job }}-${{ github.sha }}
316316
path: |
317317
/tmp/zombie*/logs/*
318+
319+
zombienet-cumulus-0010-elastic_scaling_multiple_block_per_slot:
320+
needs: [preflight]
321+
if: ${{ needs.preflight.outputs.changes_substrate || needs.preflight.outputs.changes_cumulus || needs.preflight.outputs.changes_polkadot }}
322+
runs-on: ${{ needs.preflight.outputs.ZOMBIENET_RUNNER }} # NOTE: should be zombienet-arc-runner (without quotes)
323+
timeout-minutes: 60
324+
container:
325+
image: ${{ needs.preflight.outputs.ZOMBIENET_IMAGE }}
326+
env:
327+
# sdk tests are looking for POLKADOT_IMAGE
328+
POLKADOT_IMAGE: "${{ needs.preflight.outputs.TEMP_IMAGES_BASE }}/polkadot-debug:${{ needs.preflight.outputs.DOCKER_IMAGES_VERSION }}"
329+
CUMULUS_IMAGE: "${{ needs.preflight.outputs.TEMP_IMAGES_BASE }}/test-parachain:${{ needs.preflight.outputs.DOCKER_IMAGES_VERSION }}"
330+
RUST_LOG: ${{ needs.preflight.outputs.RUST_LOG }}
331+
ZOMBIE_PROVIDER: ${{ needs.preflight.outputs.ZOMBIE_PROVIDER }}
332+
# don't retry sdk tests
333+
NEXTEST_RETRIES: 0
334+
335+
steps:
336+
- name: k8s_auth
337+
shell: bash
338+
run: |
339+
. /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
340+
k8s_auth
341+
342+
- name: Checkout
343+
uses: actions/checkout@v4
344+
345+
- uses: actions/[email protected]
346+
with:
347+
name: prepare-cumulus-zombienet-artifacts-${{ needs.preflight.outputs.SOURCE_REF_SLUG }}
348+
github-token: ${{ secrets.GITHUB_TOKEN }}
349+
run-id: ${{ needs.preflight.outputs.BUILD_RUN_ID }}
350+
351+
- name: tar
352+
run: tar -xvf artifacts.tar
353+
354+
- name: script
355+
run: |
356+
echo "POLKADOT_IMAGE: $POLKADOT_IMAGE"
357+
echo "CUMULUS_IMAGE: $CUMULUS_IMAGE"
358+
ls -ltr ./artifacts
359+
# use spot by default
360+
export X_INFRA_INSTANCE=spot
361+
# we want to use `--no-capture` in zombienet tests.
362+
unset NEXTEST_FAILURE_OUTPUT
363+
unset NEXTEST_SUCCESS_OUTPUT
364+
cargo nextest run --archive-file ./artifacts/cumulus-zombienet-tests.tar.zst --no-capture -- elastic_scaling::elastic_scaling_multiple_blocks_per_slot::elastic_scaling_multiple_block_per_slot
365+
366+
- name: upload logs
367+
uses: actions/upload-artifact@v4
368+
with:
369+
name: zombienet-logs-${{ github.job }}-${{ github.sha }}
370+
path: |
371+
/tmp/zombie*/logs/*

‎.github/zombienet-env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ZOMBIENET_IMAGE=docker.io/paritytech/zombienet:v1.3.119
1+
ZOMBIENET_IMAGE=docker.io/paritytech/zombienet:v1.3.126
22
ZOMBIENET_RUNNER=zombienet-arc-runner
33
PUSHGATEWAY_URL=http://zombienet-prometheus-pushgateway.managed-monitoring:9091/metrics/job/zombie-metrics
44
DEBUG=zombie,zombie::network-node,zombie::kube::client::logs

‎.gitlab/pipeline/zombienet.yml

-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
timeout: 60m
1313

1414
include:
15-
# substrate tests
16-
- .gitlab/pipeline/zombienet/substrate.yml
17-
# cumulus tests
18-
- .gitlab/pipeline/zombienet/cumulus.yml
1915
# polkadot tests
2016
- .gitlab/pipeline/zombienet/polkadot.yml
2117
# bridges tests

‎.gitlab/pipeline/zombienet/cumulus.yml

-177
This file was deleted.

0 commit comments

Comments
 (0)