Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into ao-disputes-rewards
Browse files Browse the repository at this point in the history
* master:
  Transaction payment runtime apis: query call info and fee details (#5871)
  [ci] Improve cancel-pipeline job (#5874)
  Bump wasmtime from 0.38.1 to 0.38.3 (#5802)
  Incorporate changes from substrate PR #11908 (#5815)
  Add nomination pools to Polkadot runtime (#5582)
  Change request-response protocol names to include genesis hash & fork id (#5870)
  [ci] Run check-runtime only for PRs (#5858)
  Bump tokio from 1.18.2 to 1.19.2 (#5678)
  Zombienet: test disputes with malus garbage candidates (#5857)
  add unit tests to run runtime migrations (#5865)
  Trivial networking changes for Substrate PR #11940 (#5841)
  Renaming CLI prunning and keep-blocks flags (#5863)
  Update yamux to fix a potential crash (#5861)
  • Loading branch information
ordian committed Aug 15, 2022
2 parents 3e70157 + b8c957d commit 5665053
Show file tree
Hide file tree
Showing 44 changed files with 1,156 additions and 369 deletions.
72 changes: 60 additions & 12 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,19 @@ default:
paths:
- ./artifacts/

# collecting vars for pipeline stopper
# they will be used if the job fails
.pipeline-stopper-vars: &pipeline-stopper-vars
- echo "FAILED_JOB_URL=${CI_JOB_URL}" > pipeline-stopper.env
- echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
- echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
- echo "PR_NUM=${CI_COMMIT_REF_NAME}" >> pipeline-stopper.env

.pipeline-stopper-artifacts: &pipeline-stopper-artifacts
artifacts:
reports:
dotenv: pipeline-stopper.env

.kubernetes-env: &kubernetes-env
retry:
max: 2
Expand Down Expand Up @@ -172,7 +185,8 @@ check-runtime:
stage: stage1
image: paritytech/tools:latest
<<: *kubernetes-env
<<: *test-refs
rules:
- if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/ # i.e. release-v0.9.27
variables:
GITLAB_API: "https://gitlab.parity.io/api/v4"
GITHUB_API_PROJECT: "parity%2Finfrastructure%2Fgithub-api"
Expand Down Expand Up @@ -222,8 +236,12 @@ build-linux-stable:
test-linux-stable:
stage: stage1
<<: *docker-env
<<: *compiler-info
<<: *common-refs
<<: *pipeline-stopper-artifacts
before_script:
- rustup show
- cargo --version
- *pipeline-stopper-vars
variables:
RUST_TOOLCHAIN: stable
# Enable debug assertions since we are running optimized builds for testing
Expand Down Expand Up @@ -307,7 +325,7 @@ build-staking-miner:
stage: stage2
# this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
needs:
- job: check-runtime
- job: cargo-fmt
artifacts: false
<<: *docker-env
<<: *test-pr-refs
Expand Down Expand Up @@ -336,7 +354,7 @@ test-node-metrics:
stage: stage2
# this is an artificial job dependency, for pipeline optimization using GitLab's DAGs
needs:
- job: check-runtime
- job: cargo-fmt
artifacts: false
<<: *docker-env
<<: *compiler-info
Expand Down Expand Up @@ -605,7 +623,6 @@ check-try-runtime:
script:
# Check that everything compiles with `try-runtime` feature flag.
- cargo check --features try-runtime --all
- sccache -s

check-no-default-features:
stage: stage3
Expand Down Expand Up @@ -738,6 +755,36 @@ zombienet-tests-parachains-disputes:
tags:
- zombienet-polkadot-integration-test

zombienet-tests-parachains-disputes-garbage-candidate:
stage: stage3
image: "${ZOMBIENET_IMAGE}"
<<: *kubernetes-env
<<: *zombienet-refs
needs:
- job: publish-polkadot-debug-image
- job: publish-test-collators-image
- job: publish-malus-image
variables:
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/functional"
before_script:
- echo "Zombie-net Tests Config"
- echo "${ZOMBIENET_IMAGE_NAME}"
- echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
- echo "${MALUS_IMAGE_NAME} ${MALUS_IMAGE_TAG}"
- echo "${GH_DIR}"
- export DEBUG=zombie,zombie::network-node
- export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
- export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
- export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
script:
- /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
--github-remote-dir="${GH_DIR}"
--test="0003-parachains-garbage-candidate.feature"
allow_failure: false
retry: 2
tags:
- zombienet-polkadot-integration-test

zombienet-test-parachains-upgrade-smoke-test:
stage: stage3
image: "${ZOMBIENET_IMAGE}"
Expand Down Expand Up @@ -974,17 +1021,18 @@ short-benchmark-westend:
when: on_failure
variables:
PROJECT_ID: "${CI_PROJECT_ID}"
PROJECT_NAME: "${CI_PROJECT_NAME}"
PIPELINE_ID: "${CI_PIPELINE_ID}"
trigger: "parity/infrastructure/ci_cd/pipeline-stopper"
FAILED_JOB_URL: "${FAILED_JOB_URL}"
FAILED_JOB_NAME: "${FAILED_JOB_NAME}"
PR_NUM: "${PR_NUM}"
trigger:
project: "parity/infrastructure/ci_cd/pipeline-stopper"
# remove branch, when pipeline-stopper for polakdot is updated to the same branch
branch: "as-improve"

cancel-pipeline-test-linux-stable:
extends: .cancel-pipeline-template
needs:
- job: test-linux-stable
artifacts: false

cancel-pipeline-check-try-runtime:
extends: .cancel-pipeline-template
needs:
- job: check-try-runtime
artifacts: false

0 comments on commit 5665053

Please sign in to comment.