From 40e4a1b6dd1beb07a04d8f96bb133d87725abc02 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Thu, 6 Jun 2024 16:22:17 +0200 Subject: [PATCH 1/2] [ci] test flatcar --- .github/workflows/tests-linux-stable.yml | 29 +++++++++++---------- .github/workflows/tests.yml | 32 +++++++++++++----------- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/.github/workflows/tests-linux-stable.yml b/.github/workflows/tests-linux-stable.yml index 5fdfabc437fe..93a22d484ac1 100644 --- a/.github/workflows/tests-linux-stable.yml +++ b/.github/workflows/tests-linux-stable.yml @@ -13,14 +13,15 @@ concurrency: cancel-in-progress: true env: - FORKLIFT_storage_s3_bucketName: ${{ secrets.FORKLIFT_storage_s3_bucketName }} - FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }} - FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }} - FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }} - FORKLIFT_metrics_pushEndpoint: ${{ secrets.FORKLIFT_metrics_pushEndpoint }} + # FORKLIFT_storage_s3_bucketName: ${{ secrets.FORKLIFT_storage_s3_bucketName }} + # FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }} + # FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }} + # FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }} + # FORKLIFT_metrics_pushEndpoint: ${{ secrets.FORKLIFT_metrics_pushEndpoint }} + FORKLIFT_storage_type: "flatcar" + FORKLIFT_storage_flatcar_url: "http://127.0.0.1:8080/Flatcar" jobs: - changes: permissions: pull-requests: read @@ -31,7 +32,7 @@ jobs: # However, env variables don't work for forks: https://github.com/orgs/community/discussions/44322 # This workaround sets the container image for each job using 'set-image' job output. needs: changes - if: ${{ needs.changes.outputs.rust }} + if: ${{ needs.changes.outputs.rust }} runs-on: ubuntu-latest outputs: IMAGE: ${{ steps.set_image.outputs.IMAGE }} @@ -40,14 +41,15 @@ jobs: uses: actions/checkout@v4 - id: set_image run: cat .github/env >> $GITHUB_OUTPUT - + test-linux-stable-int: needs: [set-image, changes] - if: ${{ needs.changes.outputs.rust }} - runs-on: arc-runners-polkadot-sdk-beefy + if: ${{ needs.changes.outputs.rust }} + runs-on: arc-runners-beefy-stg timeout-minutes: 30 container: image: ${{ needs.set-image.outputs.IMAGE }} + options: --network=host env: RUSTFLAGS: "-C debug-assertions -D warnings" RUST_BACKTRACE: 1 @@ -60,15 +62,16 @@ jobs: uses: actions/checkout@v4 - name: script run: WASM_BUILD_NO_COLOR=1 time forklift cargo test -p staging-node-cli --release --locked -- --ignored - + # https://github.com/paritytech/ci_cd/issues/864 test-linux-stable-runtime-benchmarks: needs: [set-image, changes] - if: ${{ needs.changes.outputs.rust }} - runs-on: arc-runners-polkadot-sdk-beefy + if: ${{ needs.changes.outputs.rust }} + runs-on: arc-runners-beefy-stg timeout-minutes: 30 container: image: ${{ needs.set-image.outputs.IMAGE }} + options: --network=host env: RUST_TOOLCHAIN: stable # Enable debug assertions since we are running optimized builds for testing diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 293acadc4e6a..d8f0ddb246b2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,14 +12,15 @@ concurrency: cancel-in-progress: true env: - FORKLIFT_storage_s3_bucketName: ${{ secrets.FORKLIFT_storage_s3_bucketName }} - FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }} - FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }} - FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }} - FORKLIFT_metrics_pushEndpoint: ${{ secrets.FORKLIFT_metrics_pushEndpoint }} + # FORKLIFT_storage_s3_bucketName: ${{ secrets.FORKLIFT_storage_s3_bucketName }} + # FORKLIFT_storage_s3_accessKeyId: ${{ secrets.FORKLIFT_storage_s3_accessKeyId }} + # FORKLIFT_storage_s3_secretAccessKey: ${{ secrets.FORKLIFT_storage_s3_secretAccessKey }} + # FORKLIFT_storage_s3_endpointUrl: ${{ secrets.FORKLIFT_storage_s3_endpointUrl }} + # FORKLIFT_metrics_pushEndpoint: ${{ secrets.FORKLIFT_metrics_pushEndpoint }} + FORKLIFT_storage_type: "flatcar" + FORKLIFT_storage_flatcar_url: "http://127.0.0.1:8080/Flatcar" jobs: - changes: permissions: pull-requests: read @@ -40,11 +41,12 @@ jobs: quick-benchmarks: needs: [set-image, changes] - if: ${{ needs.changes.outputs.rust }} - runs-on: arc-runners-polkadot-sdk-beefy + if: ${{ needs.changes.outputs.rust }} + runs-on: arc-runners-beefy-stg timeout-minutes: 30 container: image: ${{ needs.set-image.outputs.IMAGE }} + options: --network=host env: RUSTFLAGS: "-C debug-assertions -D warnings" RUST_BACKTRACE: "full" @@ -55,15 +57,16 @@ jobs: uses: actions/checkout@v4 - name: script run: time forklift cargo run --locked --release -p staging-node-cli --bin substrate-node --features runtime-benchmarks -- benchmark pallet --chain dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1 --quiet - + # cf https://github.com/paritytech/polkadot-sdk/issues/1652 test-syscalls: needs: [set-image, changes] - if: ${{ needs.changes.outputs.rust }} - runs-on: arc-runners-polkadot-sdk-beefy + if: ${{ needs.changes.outputs.rust }} + runs-on: arc-runners-beefy-stg timeout-minutes: 30 container: image: ${{ needs.set-image.outputs.IMAGE }} + options: --network=host continue-on-error: true # this rarely triggers in practice env: SKIP_WASM_BUILD: 1 @@ -81,14 +84,15 @@ jobs: # - if [[ "$CI_JOB_STATUS" == "failed" ]]; then # printf "The x86_64 syscalls used by the worker binaries have changed. Please review if this is expected and update polkadot/scripts/list-syscalls/*-worker-syscalls as needed.\n"; # fi - + cargo-check-all-benches: needs: [set-image, changes] - if: ${{ needs.changes.outputs.rust }} - runs-on: arc-runners-polkadot-sdk-beefy + if: ${{ needs.changes.outputs.rust }} + runs-on: arc-runners-beefy-stg timeout-minutes: 30 container: image: ${{ needs.set-image.outputs.IMAGE }} + options: --network=host env: SKIP_WASM_BUILD: 1 steps: From aa93463fb1918400cb426b6bbda23fdd6be2aa72 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Thu, 6 Jun 2024 17:21:43 +0200 Subject: [PATCH 2/2] flatcar in a strange place --- .github/workflows/tests-linux-stable.yml | 4 ++-- .github/workflows/tests.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests-linux-stable.yml b/.github/workflows/tests-linux-stable.yml index 93a22d484ac1..9f95d4cd64a0 100644 --- a/.github/workflows/tests-linux-stable.yml +++ b/.github/workflows/tests-linux-stable.yml @@ -49,7 +49,7 @@ jobs: timeout-minutes: 30 container: image: ${{ needs.set-image.outputs.IMAGE }} - options: --network=host + options: --network=flatcar_network env: RUSTFLAGS: "-C debug-assertions -D warnings" RUST_BACKTRACE: 1 @@ -71,7 +71,7 @@ jobs: timeout-minutes: 30 container: image: ${{ needs.set-image.outputs.IMAGE }} - options: --network=host + options: --network=flatcar_network env: RUST_TOOLCHAIN: stable # Enable debug assertions since we are running optimized builds for testing diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d8f0ddb246b2..3699d0197c3e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -46,7 +46,7 @@ jobs: timeout-minutes: 30 container: image: ${{ needs.set-image.outputs.IMAGE }} - options: --network=host + options: --network=flatcar_network env: RUSTFLAGS: "-C debug-assertions -D warnings" RUST_BACKTRACE: "full" @@ -66,7 +66,7 @@ jobs: timeout-minutes: 30 container: image: ${{ needs.set-image.outputs.IMAGE }} - options: --network=host + options: --network=flatcar_network continue-on-error: true # this rarely triggers in practice env: SKIP_WASM_BUILD: 1 @@ -92,7 +92,7 @@ jobs: timeout-minutes: 30 container: image: ${{ needs.set-image.outputs.IMAGE }} - options: --network=host + options: --network=flatcar_network env: SKIP_WASM_BUILD: 1 steps: