Merge branch 'master' into ao-disputes-offences-runtime

* master:
  zombienet: try to fix parachains upgrade test (#5724)
  Update dependencies (companion for substrate#11722) (#5731)
  Update metric name and doc (#5716)
  Bump reqwest from 0.11.10 to 0.11.11 (#5732)
  add release-engineering to CI files' reviewers (#5733)
  Bump parity-scale-codec from 3.1.2 to 3.1.5 (#5720)
  Add checklist item (#5715)
  Fix 5560: add support for a new `staking-miner info` command (#5577)
  Bump `wasmtime` to 0.38.0 and `zstd` to 0.11.2 (companion for substrate#11720) (#5707)
  pvf: ensure enough stack space (#5712)
  Bump generic-array from 0.12.3 to 0.12.4 in /bridges/fuzz/storage-proof (#5648)
  pvf: unignore `terminates_on_timeout` test (#5722)
  Bump proc-macro2 from 1.0.39 to 1.0.40 (#5719)
  pass $COMPANION_OVERRIDES to check_dependent_project (#5708)
  Bump thread_local from 1.1.0 to 1.1.4 in /bridges/fuzz/storage-proof (#5687)
  Bump quote from 1.0.18 to 1.0.19 (#5700)
  Rococo: add new pallet-beefy-mmr API (companion for substrate#11406) (#5516)
  Update metric before bailing out (#5706)
  Add publish docker staking-miner (#5710)

.github/ISSUE_TEMPLATE/release.md

@@ -48,4 +48,5 @@ candidate branch or started an additional release candidate branch (rc-2, rc-3,
     notes](https://github.com/paritytech/polkadot/blob/master/doc/release-checklist.md#release-notes)
 - [ ] Check that [build artifacts](https://github.com/paritytech/polkadot/blob/master/doc/release-checklist.md#build-artifacts) have been added to the
     draft-release
-- [ ] Check that all items listed in the [milestone](https://github.com/paritytech/polkadot/milestones) are included in the release.
+- [ ] Check that all items listed in the [milestone](https://github.com/paritytech/polkadot/milestones) are included in the release.
+- [ ] Ensure that no `freenotes` were added into the release branch after the latest generated RC

.github/pr-custom-review.yml

@@ -19,19 +19,20 @@ rules:
     check_type: changed_files
     condition:
       include: .*
-      # excluding files from 'Runtime files' and 'CI team' rules
+      # excluding files from 'Runtime files' and 'CI files' rules
       exclude: ^runtime/(kusama|polkadot)/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
     min_approvals: 2
     teams:
       - core-devs
 
-  - name: CI team
+  - name: CI files
     check_type: changed_files
     condition:
       include: ^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
     min_approvals: 2
     teams:
       - ci
+      - release-engineering
 
 prevent-review-request:
   teams:

.gitlab-ci.yml

@@ -106,12 +106,22 @@ default:
     - if: $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
 
+.deploy-testnet-refs:              &deploy-testnet-refs
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
+      when: never
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_COMMIT_REF_NAME == "master"
+
 .publish-refs:                     &publish-refs
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
     - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_PIPELINE_SOURCE == "web" &&
+          $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME == "master"
+    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
 
 .build-push-image:                 &build-push-image
   <<:                              *kubernetes-env
@@ -266,6 +276,22 @@ build-malus:
     - echo "polkadot-test-malus = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
     - cp -r ./scripts/* ./artifacts
 
+build-staking-miner:
+  stage:                           stage1
+  <<:                              *collect-artifacts
+  <<:                              *docker-env
+  <<:                              *compiler-info
+  <<:                              *common-refs
+  script:
+    - time cargo build --locked --release --package staking-miner
+    # pack artifacts
+    - mkdir -p ./artifacts
+    - mv ./target/release/staking-miner ./artifacts/.
+    - echo -n "${CI_COMMIT_REF_NAME}" > ./artifacts/VERSION
+    - echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
+    - echo "staking-miner = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
+    - cp -r ./scripts/* ./artifacts
+
 #### stage:                        stage2
 
 .check-dependent-project:          &check-dependent-project
@@ -286,6 +312,7 @@ build-malus:
         --dependent-repo "$DEPENDENT_REPO"
         --github-api-token "$GITHUB_PR_TOKEN"
         --extra-dependencies "$EXTRA_DEPENDENCIES"
+        --companion-overrides "$COMPANION_OVERRIDES"
 
 check-dependent-cumulus:
   <<: *check-dependent-project
@@ -424,6 +451,23 @@ publish-malus-image:
       # this artifact is used in zombienet-tests job
       dotenv: ./artifacts/malus.env
 
+publish-staking-miner-image:
+  stage:                           stage2
+  <<:                              *build-push-image
+  <<:                              *publish-refs
+  variables:
+    <<:                            *image-variables
+    # scripts/ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
+    DOCKERFILE:                    ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
+    IMAGE_NAME:                    docker.io/paritytech/staking-miner
+    GIT_STRATEGY:                  none
+    DOCKER_USER:                   ${Docker_Hub_User_Parity}
+    DOCKER_PASS:                   ${Docker_Hub_Pass_Parity}
+  needs:
+    - job:                         build-staking-miner
+      artifacts:                   true
+
+
 publish-s3-release:                &publish-s3
   stage:                           stage3
   needs:
@@ -586,7 +630,7 @@ deploy-parity-testnet:
   needs:
     - job:                         test-deterministic-wasm
       artifacts:                   false
-  <<:                              *publish-refs
+  <<:                              *deploy-testnet-refs
   variables:
     POLKADOT_CI_COMMIT_NAME:       "${CI_COMMIT_REF_NAME}"
     POLKADOT_CI_COMMIT_REF:        "${CI_COMMIT_SHORT_SHA}"
@@ -684,9 +728,9 @@ zombienet-tests-parachains-disputes:
 
 zombienet-test-parachains-upgrade-smoke-test:
   stage:                           stage3
-  image:                           "${ZOMBIENET_IMAGE}"
   <<:                              *kubernetes-env
   <<:                              *zombienet-refs
+  image:                           "docker.io/paritytech/zombienet:v1.2.45"
   needs:
     - job:                         publish-polkadot-debug-image
     - job:                         publish-malus-image
@@ -695,12 +739,12 @@ zombienet-test-parachains-upgrade-smoke-test:
     GH_DIR:                        'https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke'
   before_script:
     - echo "ZombieNet Tests Config"
-    - echo "docker.io/parity/polkadot:latest"
+    - echo "${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}"
     - echo "docker.io/parity/polkadot-collator:latest"
     - echo "${ZOMBIENET_IMAGE}"
     - echo "${GH_DIR}"
     - export DEBUG=zombie,zombie::network-node
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest" # Use polkadot latest image
+    - export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
     - export COL_IMAGE="docker.io/parity/polkadot-collator:latest" # Use cumulus lastest image
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh