Merge branch 'master' into ao-remove-old-migrations

* master: (62 commits)
  Bump tracing from 0.1.32 to 0.1.33 (#5299)
  Add staging runtime api (#5048)
  CI: rename ambiguous jobs (#5313)
  Prepare for rust 1.60 (#5282)
  Bump proc-macro2 from 1.0.36 to 1.0.37 (#5265)
  Fixes the dead lock when any of the channels get at capacity. (#5297)
  Bump syn from 1.0.90 to 1.0.91 (#5273)
  create .github/workflows/pr-custom-review.yml (#5280)
  [ci] fix pallet benchmark script (#5247) (#5292)
  bump spec_version to 9190 (#5291)
  bump version to 0.9.19 (#5290)
  Session is actually ancient not unknown. (#5286)
  [ci] point benchmark script to sub-commands (#5247) (#5289)
  Remove Travis CI (#5287)
  Improve error handling in approval voting block import (#5283)
  fix .github/pr-custom-review.yml (#5279)
  Co #11164: Sub-commands for `benchmark` (#5247)
  Bump clap from 3.1.6 to 3.1.8 (#5240)
  Custom Slots Migration for Fund Index Change (#5227)
  create pr-custom-review.yml (#5253)
  ...

.github/pr-custom-review.yml

@@ -0,0 +1,29 @@
+# 🔒 PROTECTED: Changes to locks-review-team should be approved by the current locks-review-team
+locks-review-team: locks-review
+team-leads-team: polkadot-review
+action-review-team: ci
+
+rules:
+  - name: Runtime files
+    check_type: changed_files
+    condition: ^runtime/(kusama|polkadot)/src/[^/]+\.rs$
+    all_distinct:
+      - min_approvals: 1
+        teams:
+          - locks-review
+      - min_approvals: 1
+        teams:
+          - polkadot-review
+
+  - name: Core developers
+    check_type: changed_files
+    condition:
+      include: .*
+      exclude: ^runtime/(kusama|polkadot)/src/[^/]+\.rs$
+    min_approvals: 2
+    teams:
+      - core-devs
+
+prevent-review-request:
+  teams:
+    - core-devs

.github/workflows/pr-custom-review.yml

@@ -0,0 +1,23 @@
+name: Assign reviewers
+
+on:
+  pull_request:
+    branches:
+      - master
+      - main
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - review_requested
+      - review_request_removed
+  pull_request_review:
+
+jobs:
+  pr-custom-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: pr-custom-review
+        uses: paritytech/pr-custom-review@v2
+        with:
+          token: ${{ secrets.PRCR_TOKEN }}

.gitlab-ci.yml

@@ -32,7 +32,7 @@ variables:
   CI_IMAGE:                        "paritytech/ci-linux:production"
   DOCKER_OS:                       "debian:stretch"
   ARCH:                            "x86_64"
-  ZOMBIENET_IMAGE:                 "docker.io/paritytech/zombienet:v1.2.19"
+  ZOMBIENET_IMAGE:                 "docker.io/paritytech/zombienet:v1.2.25"
   VAULT_SERVER_URL:                "https://vault.parity-mgmt-vault.parity.io"
   VAULT_AUTH_PATH:                 "gitlab-parity-io-jwt"
   VAULT_AUTH_ROLE:                 "cicd_gitlab_parity_${CI_PROJECT_NAME}"
@@ -120,10 +120,10 @@ default:
 .vault-secrets:                    &vault-secrets
   secrets:
     AWS_ACCESS_KEY_ID:
-      vault:                       cicd/gitlab/$CI_PROJECT_PATH/AWS_ACCESS_KEY_ID@kv
+      vault:                       cicd/gitlab/parity/polkadot/AWS_ACCESS_KEY_ID@kv
       file:                        false
     AWS_SECRET_ACCESS_KEY:
-      vault:                       cicd/gitlab/$CI_PROJECT_PATH/AWS_SECRET_ACCESS_KEY@kv
+      vault:                       cicd/gitlab/parity/polkadot/AWS_SECRET_ACCESS_KEY@kv
       file:                        false
     GITHUB_PR_TOKEN:
       vault:                       cicd/gitlab/parity/GITHUB_PR_TOKEN@kv
@@ -132,31 +132,31 @@ default:
       vault:                       cicd/gitlab/parity/GITHUB_TOKEN@kv
       file:                        false
     GITHUB_USER:
-      vault:                       cicd/gitlab/$CI_PROJECT_PATH/GITHUB_USER@kv
+      vault:                       cicd/gitlab/parity/polkadot/GITHUB_USER@kv
       file:                        false
     GITHUB_RELEASE_TOKEN:
-      vault:                       cicd/gitlab/$CI_PROJECT_PATH/GITHUB_RELEASE_TOKEN@kv
+      vault:                       cicd/gitlab/parity/polkadot/GITHUB_RELEASE_TOKEN@kv
       file:                        false
     GITHUB_SSH_PRIV_KEY:
-      vault:                       cicd/gitlab/$CI_PROJECT_PATH/GITHUB_SSH_PRIV_KEY@kv
+      vault:                       cicd/gitlab/parity/polkadot/GITHUB_SSH_PRIV_KEY@kv
       file:                        false
     MATRIX_ACCESS_TOKEN:
-      vault:                       cicd/gitlab/$CI_PROJECT_PATH/MATRIX_ACCESS_TOKEN@kv
+      vault:                       cicd/gitlab/parity/polkadot/MATRIX_ACCESS_TOKEN@kv
       file:                        false
     MATRIX_ROOM_ID:
-      vault:                       cicd/gitlab/$CI_PROJECT_PATH/MATRIX_ROOM_ID@kv
+      vault:                       cicd/gitlab/parity/polkadot/MATRIX_ROOM_ID@kv
       file:                        false
     PARITYPR_USER:
-      vault:                       cicd/gitlab/$CI_PROJECT_PATH/PARITYPR_USER@kv
+      vault:                       cicd/gitlab/parity/polkadot/PARITYPR_USER@kv
       file:                        false
     PARITYPR_PASS:
-      vault:                       cicd/gitlab/$CI_PROJECT_PATH/PARITYPR_PASS@kv
+      vault:                       cicd/gitlab/parity/polkadot/PARITYPR_PASS@kv
       file:                        false
     PIPELINE_TOKEN:
-      vault:                       cicd/gitlab/$CI_PROJECT_PATH/PIPELINE_TOKEN@kv
+      vault:                       cicd/gitlab/parity/polkadot/PIPELINE_TOKEN@kv
       file:                        false
     REL_MAN_ROOM_ID:
-      vault:                       cicd/gitlab/$CI_PROJECT_PATH/REL_MAN_ROOM_ID@kv
+      vault:                       cicd/gitlab/parity/polkadot/REL_MAN_ROOM_ID@kv
       file:                        false
 
 .build-push-image:                 &build-push-image
@@ -227,6 +227,8 @@ build-linux-stable:
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
     RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
+    # Ensure we run the UI tests.
+    RUN_UI_TESTS: 1
   script:
     - time cargo build --profile testnet --features pyroscope --verbose --bin polkadot
     - sccache -s
@@ -535,6 +537,11 @@ update_westend_weights:
   variables:
     RUNTIME:                       westend
 
+update_rococo_weights:
+  <<:                              *update-weights
+  variables:
+    RUNTIME:                       rococo
+
 #### stage:                        stage3
 
 build-rustdoc:
@@ -655,7 +662,7 @@ zombienet-tests-parachains-smoke-test:
     - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
     - export COL_IMAGE="docker.io/paritypr/colander:4519" # The collator image is fixed
   script:
-    - /home/nonroot/zombie-net/scripts/run-test-env-manager.sh
+    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
         --github-remote-dir="${GH_DIR}"
         --test="0001-parachains-smoke-test.feature"
   allow_failure:                   false
@@ -684,7 +691,7 @@ zombienet-tests-parachains-pvf:
     - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
     - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
   script:
-    - /home/nonroot/zombie-net/scripts/run-test-env-manager.sh
+    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
         --github-remote-dir="${GH_DIR}"
         --test="0001-parachains-pvf.feature"
   allow_failure:                   false
@@ -714,7 +721,7 @@ zombienet-tests-parachains-disputes:
     - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
     - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
   script:
-    - /home/nonroot/zombie-net/scripts/run-test-env-manager.sh
+    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
         --github-remote-dir="${GH_DIR}"
         --test="0002-parachains-disputes.feature"
   allow_failure:                   false
@@ -744,7 +751,7 @@ zombienet-tests-malus-dispute-valid:
     - export MALUS_IMAGE=${MALUS_IMAGE_NAME}:${MALUS_IMAGE_TAG}
     - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
   script:
-    - /home/nonroot/zombie-net/scripts/run-test-env-manager.sh
+    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
         --github-remote-dir="${GH_DIR}"
         --test="0001-dispute-valid-block.feature"
   allow_failure:                   false
@@ -814,10 +821,8 @@ short-benchmark-polkadot:          &short-bench
       artifacts:                   true
   variables:
     RUNTIME:                       polkadot
-  # FIXME: https://github.com/paritytech/substrate/pull/11109
-  allow_failure:                   true
   script:
-    - ./artifacts/polkadot benchmark --execution wasm --wasm-execution compiled --chain $RUNTIME-dev --pallet "*" --extrinsic "*" --steps 1 --repeat 1
+    - ./artifacts/polkadot benchmark pallet --execution wasm --wasm-execution compiled --chain $RUNTIME-dev --pallet "*" --extrinsic "*" --steps 1 --repeat 1
 
 short-benchmark-kusama:
   <<:                              *short-bench