From 1b68b74e3c3986d5565336256c9bd5bbb01416fb Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 5 Oct 2022 12:14:19 +0200 Subject: [PATCH 01/25] [WIP][ci] Add node to check-runtime-migration job --- scripts/ci/gitlab/pipeline/check.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 0e435d604821..3a6accc2768a 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -51,13 +51,19 @@ check-try-runtime: - cargo check --features try-runtime --all # More info can be found here: https://github.com/paritytech/polkadot/pull/5865 -# Works only in PRs +# Works only in PRs with E1 label check-runtime-migration: stage: check extends: - - .docker-env + # - .docker-env + # k8s runner for test + - .kubernetes-env - .test-pr-refs - .compiler-info + # for test + timeout: 3h + variables: + WS: ws://substrate-api-sidecar-benchmark-node.nodes:9944 script: - | export has_runtimemigration_label=$(curl -sS -H "Accept: application/vnd.github+json" \ From fee51d64359b8c1ff49bd0c7272da84b8e2b919d Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 5 Oct 2022 12:22:57 +0200 Subject: [PATCH 02/25] add image --- scripts/ci/gitlab/pipeline/check.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 3a6accc2768a..2ee49e914940 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -62,6 +62,7 @@ check-runtime-migration: - .compiler-info # for test timeout: 3h + image: "paritytech/ci-linux:production" variables: WS: ws://substrate-api-sidecar-benchmark-node.nodes:9944 script: From 6321bace90dfb4403d58a61d7eb447d446b5eb88 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 5 Oct 2022 12:59:22 +0200 Subject: [PATCH 03/25] remove sscache from before_script --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce9be9af767a..8d93ccc2f26d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,7 +98,6 @@ default: before_script: - rustup show - cargo --version - - sccache -s .test-refs: rules: From a9bbc8665903e1688af705f3e048676a7181fb7c Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 5 Oct 2022 15:45:11 +0200 Subject: [PATCH 04/25] add nodes --- scripts/ci/gitlab/pipeline/check.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 2ee49e914940..c457316b7a42 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -55,16 +55,11 @@ check-try-runtime: check-runtime-migration: stage: check extends: - # - .docker-env - # k8s runner for test - - .kubernetes-env + - .docker-env - .test-pr-refs - .compiler-info - # for test - timeout: 3h - image: "paritytech/ci-linux:production" variables: - WS: ws://substrate-api-sidecar-benchmark-node.nodes:9944 + WS: wss://polkadot-try-runtime-node.parity-chains.parity.io:433 script: - | export has_runtimemigration_label=$(curl -sS -H "Accept: application/vnd.github+json" \ @@ -74,7 +69,12 @@ check-runtime-migration: if [[ $has_runtimemigration_label != 0 ]]; then echo "Found label runtimemigration. Running tests" export RUST_LOG=remote-ext=debug,runtime=debug - time cargo test --release -p westend-runtime -p polkadot-runtime -p kusama-runtime --features try-runtime + export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io:433" + time cargo test --release -p polkadot-runtime --features try-runtime + export WS="wss://kusama-try-runtime-node.parity-chains.parity.io:433" + time cargo test --release -p kusama-runtime --features try-runtime + export WS="wss://westend-try-runtime-node.parity-chains.parity.io:433" + time cargo test --release -p westend-runtime --features try-runtime else echo "runtimemigration label not found. Skipping" fi From 54e513cfe89088c83e3c6655a053ff63b4b4735d Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 5 Oct 2022 16:10:23 +0200 Subject: [PATCH 05/25] restart pipeline From a4410fc0511fda64bcb10b2dc634db2b20ceab9b Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 5 Oct 2022 16:42:51 +0200 Subject: [PATCH 06/25] restart pipeline2 From f3bd8772aa1f15039cb22372122947774bad6454 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 5 Oct 2022 17:39:08 +0200 Subject: [PATCH 07/25] disable other jobs --- .gitlab-ci.yml | 18 +++++++++--------- scripts/ci/gitlab/pipeline/check.yml | 3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d93ccc2f26d..082fc8dbfa3a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -185,15 +185,15 @@ include: # check jobs - scripts/ci/gitlab/pipeline/check.yml # test jobs - - scripts/ci/gitlab/pipeline/test.yml - # build jobs - - scripts/ci/gitlab/pipeline/build.yml - # short-benchmarks jobs - - scripts/ci/gitlab/pipeline/short-benchmarks.yml - # publish jobs - - scripts/ci/gitlab/pipeline/publish.yml - # zombienet jobs - - scripts/ci/gitlab/pipeline/zombienet.yml + # - scripts/ci/gitlab/pipeline/test.yml + # # build jobs + # - scripts/ci/gitlab/pipeline/build.yml + # # short-benchmarks jobs + # - scripts/ci/gitlab/pipeline/short-benchmarks.yml + # # publish jobs + # - scripts/ci/gitlab/pipeline/publish.yml + # # zombienet jobs + # - scripts/ci/gitlab/pipeline/zombienet.yml diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index c457316b7a42..5a44ee3d480b 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -69,10 +69,13 @@ check-runtime-migration: if [[ $has_runtimemigration_label != 0 ]]; then echo "Found label runtimemigration. Running tests" export RUST_LOG=remote-ext=debug,runtime=debug + echo "Running try-runtime for polkadot" export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io:433" time cargo test --release -p polkadot-runtime --features try-runtime + echo "Running try-runtime for kusama" export WS="wss://kusama-try-runtime-node.parity-chains.parity.io:433" time cargo test --release -p kusama-runtime --features try-runtime + echo "Running try-runtime for westend" export WS="wss://westend-try-runtime-node.parity-chains.parity.io:433" time cargo test --release -p westend-runtime --features try-runtime else From a04d7acecf5c8bf8fb275c00a7cb74d74c99d800 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Thu, 6 Oct 2022 11:07:58 +0200 Subject: [PATCH 08/25] debug --- scripts/ci/gitlab/pipeline/check.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 5a44ee3d480b..11e480ad0ec5 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -71,6 +71,7 @@ check-runtime-migration: export RUST_LOG=remote-ext=debug,runtime=debug echo "Running try-runtime for polkadot" export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io:433" + sleep 3600 time cargo test --release -p polkadot-runtime --features try-runtime echo "Running try-runtime for kusama" export WS="wss://kusama-try-runtime-node.parity-chains.parity.io:433" From dd41e23773463247be4182ca335aad5a0f684edc Mon Sep 17 00:00:00 2001 From: alvicsam Date: Thu, 6 Oct 2022 11:27:18 +0200 Subject: [PATCH 09/25] remove debug --- scripts/ci/gitlab/pipeline/check.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 11e480ad0ec5..4f1c0444f7ce 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -70,14 +70,13 @@ check-runtime-migration: echo "Found label runtimemigration. Running tests" export RUST_LOG=remote-ext=debug,runtime=debug echo "Running try-runtime for polkadot" - export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io:433" - sleep 3600 + export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io" time cargo test --release -p polkadot-runtime --features try-runtime echo "Running try-runtime for kusama" - export WS="wss://kusama-try-runtime-node.parity-chains.parity.io:433" + export WS="wss://kusama-try-runtime-node.parity-chains.parity.io" time cargo test --release -p kusama-runtime --features try-runtime echo "Running try-runtime for westend" - export WS="wss://westend-try-runtime-node.parity-chains.parity.io:433" + export WS="wss://westend-try-runtime-node.parity-chains.parity.io" time cargo test --release -p westend-runtime --features try-runtime else echo "runtimemigration label not found. Skipping" From 723ba64fce23cf02ccf3ad5c8b34d775732f95f9 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Thu, 6 Oct 2022 15:35:44 +0200 Subject: [PATCH 10/25] add ports --- scripts/ci/gitlab/pipeline/check.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 4f1c0444f7ce..46ef34d16fae 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -70,13 +70,13 @@ check-runtime-migration: echo "Found label runtimemigration. Running tests" export RUST_LOG=remote-ext=debug,runtime=debug echo "Running try-runtime for polkadot" - export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io" + export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io:443" time cargo test --release -p polkadot-runtime --features try-runtime echo "Running try-runtime for kusama" - export WS="wss://kusama-try-runtime-node.parity-chains.parity.io" + export WS="wss://kusama-try-runtime-node.parity-chains.parity.io:443" time cargo test --release -p kusama-runtime --features try-runtime echo "Running try-runtime for westend" - export WS="wss://westend-try-runtime-node.parity-chains.parity.io" + export WS="wss://westend-try-runtime-node.parity-chains.parity.io:443" time cargo test --release -p westend-runtime --features try-runtime else echo "runtimemigration label not found. Skipping" From 0ccc776cd515a890268b46128a5a841f6dde42a4 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Fri, 7 Oct 2022 13:57:49 +0200 Subject: [PATCH 11/25] restart pipeline From f11ef7f11dd0eeba5df7d49714f1a3c9125415fa Mon Sep 17 00:00:00 2001 From: alvicsam Date: Fri, 7 Oct 2022 14:33:22 +0200 Subject: [PATCH 12/25] restart pipeline From 5526842ea66103ccd2e1bdf61b25014103d131ed Mon Sep 17 00:00:00 2001 From: alvicsam Date: Tue, 11 Oct 2022 14:39:50 +0200 Subject: [PATCH 13/25] restart pipeline From cd0245c61a83ee12c6828cb25573dc97f08e1f9d Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 12 Oct 2022 11:18:01 +0200 Subject: [PATCH 14/25] try kusama first --- scripts/ci/gitlab/pipeline/check.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 46ef34d16fae..0d007402b225 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -69,15 +69,15 @@ check-runtime-migration: if [[ $has_runtimemigration_label != 0 ]]; then echo "Found label runtimemigration. Running tests" export RUST_LOG=remote-ext=debug,runtime=debug - echo "Running try-runtime for polkadot" - export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io:443" - time cargo test --release -p polkadot-runtime --features try-runtime - echo "Running try-runtime for kusama" + echo "---------- Running try-runtime for kusama "---------- export WS="wss://kusama-try-runtime-node.parity-chains.parity.io:443" time cargo test --release -p kusama-runtime --features try-runtime - echo "Running try-runtime for westend" + echo ""---------- Running try-runtime for westend "----------" export WS="wss://westend-try-runtime-node.parity-chains.parity.io:443" time cargo test --release -p westend-runtime --features try-runtime + echo ""---------- Running try-runtime for polkadot "----------" + export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io:443" + time cargo test --release -p polkadot-runtime --features try-runtime else echo "runtimemigration label not found. Skipping" fi From 25e7359eb66263283e32819261977d41f75c7acf Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 12 Oct 2022 16:08:08 +0200 Subject: [PATCH 15/25] run polkadot 1st --- scripts/ci/gitlab/pipeline/check.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 0d007402b225..efc9c77b62ce 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -69,15 +69,15 @@ check-runtime-migration: if [[ $has_runtimemigration_label != 0 ]]; then echo "Found label runtimemigration. Running tests" export RUST_LOG=remote-ext=debug,runtime=debug + echo ""---------- Running try-runtime for polkadot "----------" + export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io:443" + time cargo test --release -p polkadot-runtime --features try-runtime echo "---------- Running try-runtime for kusama "---------- export WS="wss://kusama-try-runtime-node.parity-chains.parity.io:443" time cargo test --release -p kusama-runtime --features try-runtime echo ""---------- Running try-runtime for westend "----------" export WS="wss://westend-try-runtime-node.parity-chains.parity.io:443" time cargo test --release -p westend-runtime --features try-runtime - echo ""---------- Running try-runtime for polkadot "----------" - export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io:443" - time cargo test --release -p polkadot-runtime --features try-runtime else echo "runtimemigration label not found. Skipping" fi From 79fe1f55bc0d0d5dd3e46fd6145260ba20b11630 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Mon, 21 Nov 2022 10:25:18 +0100 Subject: [PATCH 16/25] disable some jobs --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2fc18bea0b1..24ac3f9d2efc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -228,7 +228,7 @@ deploy-parity-testnet: project: "parity/infrastructure/ci_cd/pipeline-stopper" branch: "as-improve" -remove-cancel-pipeline-message: +.remove-cancel-pipeline-message: stage: .post rules: - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs @@ -243,7 +243,7 @@ remove-cancel-pipeline-message: project: "parity/infrastructure/ci_cd/pipeline-stopper" branch: "as-improve" -cancel-pipeline-test-linux-stable: +.cancel-pipeline-test-linux-stable: extends: .cancel-pipeline-template needs: - job: test-linux-stable From 77ae601a335a060f15fb5d4f1e14b1ebc38b090d Mon Sep 17 00:00:00 2001 From: alvicsam Date: Mon, 28 Nov 2022 16:29:58 +0100 Subject: [PATCH 17/25] try command from command bot --- .gitlab-ci.yml | 2 +- scripts/ci/gitlab/pipeline/check.yml | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24ac3f9d2efc..7edadcdf66ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -181,7 +181,7 @@ default: include: # weights jobs - - scripts/ci/gitlab/pipeline/weights.yml + # - scripts/ci/gitlab/pipeline/weights.yml # check jobs - scripts/ci/gitlab/pipeline/check.yml # test jobs diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index efc9c77b62ce..42596d052e08 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -1,7 +1,7 @@ # This file is part of .gitlab-ci.yml # Here are all jobs that are executed during "check" stage -check-runtime: +.check-runtime: stage: check image: paritytech/tools:latest extends: @@ -15,7 +15,7 @@ check-runtime: - ./scripts/ci/gitlab/check_runtime.sh allow_failure: true -cargo-fmt: +.cargo-fmt: stage: check extends: - .docker-env @@ -25,7 +25,7 @@ cargo-fmt: - cargo +nightly fmt --all -- --check allow_failure: true -spellcheck: +.spellcheck: stage: check extends: - .docker-env @@ -40,7 +40,7 @@ spellcheck: $(git diff --diff-filter=AM --name-only $(git merge-base ${CI_COMMIT_SHA} ${CI_DEFAULT_BRANCH} -- :^bridges)) allow_failure: true -check-try-runtime: +.check-try-runtime: stage: check extends: - .docker-env @@ -71,20 +71,20 @@ check-runtime-migration: export RUST_LOG=remote-ext=debug,runtime=debug echo ""---------- Running try-runtime for polkadot "----------" export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io:443" - time cargo test --release -p polkadot-runtime --features try-runtime - echo "---------- Running try-runtime for kusama "---------- - export WS="wss://kusama-try-runtime-node.parity-chains.parity.io:443" - time cargo test --release -p kusama-runtime --features try-runtime - echo ""---------- Running try-runtime for westend "----------" - export WS="wss://westend-try-runtime-node.parity-chains.parity.io:443" - time cargo test --release -p westend-runtime --features try-runtime + time cargo test --release -p polkadot-runtime --features try-runtime --chain=polkadot-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://polkadot-try-runtime-node.parity-chains.parity.io:443 + # echo "---------- Running try-runtime for kusama "---------- + # export WS="wss://kusama-try-runtime-node.parity-chains.parity.io:443" + # time cargo test --release -p kusama-runtime --features try-runtime + # echo ""---------- Running try-runtime for westend "----------" + # export WS="wss://westend-try-runtime-node.parity-chains.parity.io:443" + # time cargo test --release -p westend-runtime --features try-runtime else echo "runtimemigration label not found. Skipping" fi allow_failure: true # is broken, need to fix -check-no-default-features: +.check-no-default-features: stage: check extends: - .docker-env @@ -97,7 +97,7 @@ check-no-default-features: - exit 0 # this is artificial job to run some build and tests using DAG -job-starter: +.job-starter: stage: check image: paritytech/tools:latest extends: From 50c5450adc0372ce70578f743222cb6b7a1ae5b7 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Mon, 28 Nov 2022 17:12:36 +0100 Subject: [PATCH 18/25] cargo run --- scripts/ci/gitlab/pipeline/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 42596d052e08..1ff7e85e47de 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -71,7 +71,7 @@ check-runtime-migration: export RUST_LOG=remote-ext=debug,runtime=debug echo ""---------- Running try-runtime for polkadot "----------" export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io:443" - time cargo test --release -p polkadot-runtime --features try-runtime --chain=polkadot-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://polkadot-try-runtime-node.parity-chains.parity.io:443 + time cargo run --release -p polkadot-runtime --features try-runtime --chain=polkadot-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://polkadot-try-runtime-node.parity-chains.parity.io:443 # echo "---------- Running try-runtime for kusama "---------- # export WS="wss://kusama-try-runtime-node.parity-chains.parity.io:443" # time cargo test --release -p kusama-runtime --features try-runtime From 4e25cf5dd62c6c3e3550d471cfe51bba98888441 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Mon, 28 Nov 2022 17:16:48 +0100 Subject: [PATCH 19/25] test passing variables --- scripts/ci/gitlab/pipeline/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 1ff7e85e47de..49fe2e8efef5 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -71,7 +71,7 @@ check-runtime-migration: export RUST_LOG=remote-ext=debug,runtime=debug echo ""---------- Running try-runtime for polkadot "----------" export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io:443" - time cargo run --release -p polkadot-runtime --features try-runtime --chain=polkadot-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://polkadot-try-runtime-node.parity-chains.parity.io:443 + time cargo test --release -p polkadot-runtime --features try-runtime -- --chain=polkadot-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://polkadot-try-runtime-node.parity-chains.parity.io:443 # echo "---------- Running try-runtime for kusama "---------- # export WS="wss://kusama-try-runtime-node.parity-chains.parity.io:443" # time cargo test --release -p kusama-runtime --features try-runtime From 593bd34de6583bd8ddd55de9f2869923ef7509c6 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Mon, 28 Nov 2022 17:26:07 +0100 Subject: [PATCH 20/25] run without condition --- scripts/ci/gitlab/pipeline/check.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 49fe2e8efef5..f857926e3be5 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -61,6 +61,7 @@ check-runtime-migration: variables: WS: wss://polkadot-try-runtime-node.parity-chains.parity.io:433 script: + - time cargo run --release --features=try-runtime try-runtime --chain=polkadot-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://polkadot-try-runtime-node.parity-chains.parity.io:443 - | export has_runtimemigration_label=$(curl -sS -H "Accept: application/vnd.github+json" \ -H "Authorization: token $GITHUB_PR_TOKEN" \ @@ -71,7 +72,7 @@ check-runtime-migration: export RUST_LOG=remote-ext=debug,runtime=debug echo ""---------- Running try-runtime for polkadot "----------" export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io:443" - time cargo test --release -p polkadot-runtime --features try-runtime -- --chain=polkadot-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://polkadot-try-runtime-node.parity-chains.parity.io:443 + # time cargo run --release --features=try-runtime try-runtime --chain=polkadot-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://polkadot-try-runtime-node.parity-chains.parity.io:443 # echo "---------- Running try-runtime for kusama "---------- # export WS="wss://kusama-try-runtime-node.parity-chains.parity.io:443" # time cargo test --release -p kusama-runtime --features try-runtime From afcd56b1c07c780a0293b521c0a440d426f75bbe Mon Sep 17 00:00:00 2001 From: alvicsam Date: Mon, 28 Nov 2022 17:47:20 +0100 Subject: [PATCH 21/25] adjust kusama and westend --- scripts/ci/gitlab/pipeline/check.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index f857926e3be5..90d22c301211 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -61,7 +61,7 @@ check-runtime-migration: variables: WS: wss://polkadot-try-runtime-node.parity-chains.parity.io:433 script: - - time cargo run --release --features=try-runtime try-runtime --chain=polkadot-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://polkadot-try-runtime-node.parity-chains.parity.io:443 + - - | export has_runtimemigration_label=$(curl -sS -H "Accept: application/vnd.github+json" \ -H "Authorization: token $GITHUB_PR_TOKEN" \ @@ -71,14 +71,11 @@ check-runtime-migration: echo "Found label runtimemigration. Running tests" export RUST_LOG=remote-ext=debug,runtime=debug echo ""---------- Running try-runtime for polkadot "----------" - export WS="wss://polkadot-try-runtime-node.parity-chains.parity.io:443" - # time cargo run --release --features=try-runtime try-runtime --chain=polkadot-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://polkadot-try-runtime-node.parity-chains.parity.io:443 - # echo "---------- Running try-runtime for kusama "---------- - # export WS="wss://kusama-try-runtime-node.parity-chains.parity.io:443" - # time cargo test --release -p kusama-runtime --features try-runtime - # echo ""---------- Running try-runtime for westend "----------" - # export WS="wss://westend-try-runtime-node.parity-chains.parity.io:443" - # time cargo test --release -p westend-runtime --features try-runtime + time cargo run --release --features=try-runtime try-runtime --chain=polkadot-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://polkadot-try-runtime-node.parity-chains.parity.io:443 + echo "---------- Running try-runtime for kusama "---------- + time cargo run --release --features=try-runtime try-runtime --chain=kusama-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://kusama-try-runtime-node.parity-chains.parity.io:443 + echo ""---------- Running try-runtime for westend "----------" + time cargo run --release --features=try-runtime try-runtime --chain=westend-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://westend-try-runtime-node.parity-chains.parity.io:443 else echo "runtimemigration label not found. Skipping" fi From a342d2cf61de5887093e065ae1bad9e63572b395 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Mon, 28 Nov 2022 17:48:12 +0100 Subject: [PATCH 22/25] fix --- scripts/ci/gitlab/pipeline/check.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 90d22c301211..f2ee154f69e0 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -61,7 +61,6 @@ check-runtime-migration: variables: WS: wss://polkadot-try-runtime-node.parity-chains.parity.io:433 script: - - - | export has_runtimemigration_label=$(curl -sS -H "Accept: application/vnd.github+json" \ -H "Authorization: token $GITHUB_PR_TOKEN" \ From 0ae3ca8d770a4120a333b688fa05b63c3207c1b5 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Tue, 29 Nov 2022 15:21:37 +0100 Subject: [PATCH 23/25] return jobs --- .gitlab-ci.yml | 16 ++++++++-------- scripts/ci/gitlab/pipeline/check.yml | 20 +++++++++----------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7edadcdf66ae..e52b78638ae5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -181,19 +181,19 @@ default: include: # weights jobs - # - scripts/ci/gitlab/pipeline/weights.yml + - scripts/ci/gitlab/pipeline/weights.yml # check jobs - scripts/ci/gitlab/pipeline/check.yml # test jobs - # - scripts/ci/gitlab/pipeline/test.yml + - scripts/ci/gitlab/pipeline/test.yml # # build jobs - # - scripts/ci/gitlab/pipeline/build.yml + - scripts/ci/gitlab/pipeline/build.yml # # short-benchmarks jobs - # - scripts/ci/gitlab/pipeline/short-benchmarks.yml + - scripts/ci/gitlab/pipeline/short-benchmarks.yml # # publish jobs - # - scripts/ci/gitlab/pipeline/publish.yml + - scripts/ci/gitlab/pipeline/publish.yml # # zombienet jobs - # - scripts/ci/gitlab/pipeline/zombienet.yml + - scripts/ci/gitlab/pipeline/zombienet.yml @@ -228,7 +228,7 @@ deploy-parity-testnet: project: "parity/infrastructure/ci_cd/pipeline-stopper" branch: "as-improve" -.remove-cancel-pipeline-message: +remove-cancel-pipeline-message: stage: .post rules: - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs @@ -243,7 +243,7 @@ deploy-parity-testnet: project: "parity/infrastructure/ci_cd/pipeline-stopper" branch: "as-improve" -.cancel-pipeline-test-linux-stable: +cancel-pipeline-test-linux-stable: extends: .cancel-pipeline-template needs: - job: test-linux-stable diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index f2ee154f69e0..ffea63a6fd84 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -1,7 +1,7 @@ # This file is part of .gitlab-ci.yml # Here are all jobs that are executed during "check" stage -.check-runtime: +check-runtime: stage: check image: paritytech/tools:latest extends: @@ -15,7 +15,7 @@ - ./scripts/ci/gitlab/check_runtime.sh allow_failure: true -.cargo-fmt: +cargo-fmt: stage: check extends: - .docker-env @@ -25,7 +25,7 @@ - cargo +nightly fmt --all -- --check allow_failure: true -.spellcheck: +spellcheck: stage: check extends: - .docker-env @@ -40,7 +40,7 @@ $(git diff --diff-filter=AM --name-only $(git merge-base ${CI_COMMIT_SHA} ${CI_DEFAULT_BRANCH} -- :^bridges)) allow_failure: true -.check-try-runtime: +check-try-runtime: stage: check extends: - .docker-env @@ -58,8 +58,6 @@ check-runtime-migration: - .docker-env - .test-pr-refs - .compiler-info - variables: - WS: wss://polkadot-try-runtime-node.parity-chains.parity.io:433 script: - | export has_runtimemigration_label=$(curl -sS -H "Accept: application/vnd.github+json" \ @@ -69,11 +67,11 @@ check-runtime-migration: if [[ $has_runtimemigration_label != 0 ]]; then echo "Found label runtimemigration. Running tests" export RUST_LOG=remote-ext=debug,runtime=debug - echo ""---------- Running try-runtime for polkadot "----------" + echo "---------- Running try-runtime for polkadot ----------" time cargo run --release --features=try-runtime try-runtime --chain=polkadot-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://polkadot-try-runtime-node.parity-chains.parity.io:443 - echo "---------- Running try-runtime for kusama "---------- + echo "---------- Running try-runtime for kusama ----------" time cargo run --release --features=try-runtime try-runtime --chain=kusama-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://kusama-try-runtime-node.parity-chains.parity.io:443 - echo ""---------- Running try-runtime for westend "----------" + echo "---------- Running try-runtime for westend ----------" time cargo run --release --features=try-runtime try-runtime --chain=westend-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://westend-try-runtime-node.parity-chains.parity.io:443 else echo "runtimemigration label not found. Skipping" @@ -81,7 +79,7 @@ check-runtime-migration: allow_failure: true # is broken, need to fix -.check-no-default-features: +check-no-default-features: stage: check extends: - .docker-env @@ -94,7 +92,7 @@ check-runtime-migration: - exit 0 # this is artificial job to run some build and tests using DAG -.job-starter: +job-starter: stage: check image: paritytech/tools:latest extends: From 9eca913c0a2e8ebcb302fa751a3f45a790147db8 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 30 Nov 2022 09:52:18 +0100 Subject: [PATCH 24/25] fix small nits --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e52b78638ae5..435b054a9fb3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -186,13 +186,13 @@ include: - scripts/ci/gitlab/pipeline/check.yml # test jobs - scripts/ci/gitlab/pipeline/test.yml - # # build jobs + # build jobs - scripts/ci/gitlab/pipeline/build.yml - # # short-benchmarks jobs + # short-benchmarks jobs - scripts/ci/gitlab/pipeline/short-benchmarks.yml - # # publish jobs + # publish jobs - scripts/ci/gitlab/pipeline/publish.yml - # # zombienet jobs + # zombienet jobs - scripts/ci/gitlab/pipeline/zombienet.yml From 8e2ba17a900e5206fc90abdf82e982428c91f169 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Thu, 8 Dec 2022 12:44:27 +0100 Subject: [PATCH 25/25] split check-runtime-migration --- scripts/ci/gitlab/pipeline/check.yml | 40 +++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index ffea63a6fd84..f443e76d6779 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -52,7 +52,7 @@ check-try-runtime: # More info can be found here: https://github.com/paritytech/polkadot/pull/5865 # Works only in PRs with E1 label -check-runtime-migration: +.check-runtime-migration: stage: check extends: - .docker-env @@ -67,15 +67,41 @@ check-runtime-migration: if [[ $has_runtimemigration_label != 0 ]]; then echo "Found label runtimemigration. Running tests" export RUST_LOG=remote-ext=debug,runtime=debug - echo "---------- Running try-runtime for polkadot ----------" - time cargo run --release --features=try-runtime try-runtime --chain=polkadot-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://polkadot-try-runtime-node.parity-chains.parity.io:443 - echo "---------- Running try-runtime for kusama ----------" - time cargo run --release --features=try-runtime try-runtime --chain=kusama-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://kusama-try-runtime-node.parity-chains.parity.io:443 - echo "---------- Running try-runtime for westend ----------" - time cargo run --release --features=try-runtime try-runtime --chain=westend-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://westend-try-runtime-node.parity-chains.parity.io:443 + echo "---------- Running try-runtime for ${NETWORK} ----------" + time cargo run --release --features=try-runtime try-runtime --chain=${NETWORK}-dev --execution=Wasm --no-spec-check-panic on-runtime-upgrade live --uri wss://${NETWORK}-try-runtime-node.parity-chains.parity.io:443 else echo "runtimemigration label not found. Skipping" fi + +check-runtime-migration-polkadot: + stage: check + extends: + - .docker-env + - .test-pr-refs + - .compiler-info + - .check-runtime-migration + variables: + NETWORK: "polkadot" + +check-runtime-migration-kusama: + stage: check + extends: + - .docker-env + - .test-pr-refs + - .compiler-info + - .check-runtime-migration + variables: + NETWORK: "kusama" + +check-runtime-migration-westend: + stage: check + extends: + - .docker-env + - .test-pr-refs + - .compiler-info + - .check-runtime-migration + variables: + NETWORK: "westend" allow_failure: true # is broken, need to fix