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

Commit 65146ca

Browse files
ordianordian
committed
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)
2 parents 097d6c1 + 7096430 commit 65146ca

File tree

68 files changed

+1337
-989
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1337
-989
lines changed

‎.github/ISSUE_TEMPLATE/release.md‎

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

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,20 @@ rules:
1919
check_type: changed_files
2020
condition:
2121
include: .*
22-
# excluding files from 'Runtime files' and 'CI team' rules
22+
# excluding files from 'Runtime files' and 'CI files' rules
2323
exclude: ^runtime/(kusama|polkadot)/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
2424
min_approvals: 2
2525
teams:
2626
- core-devs
2727

28-
- name: CI team
28+
- name: CI files
2929
check_type: changed_files
3030
condition:
3131
include: ^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
3232
min_approvals: 2
3333
teams:
3434
- ci
35+
- release-engineering
3536

3637
prevent-review-request:
3738
teams:

‎.gitlab-ci.yml‎

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,22 @@ default:
106106
- if: $CI_COMMIT_REF_NAME == "master"
107107
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
108108

109+
.deploy-testnet-refs: &deploy-testnet-refs
110+
rules:
111+
- if: $CI_PIPELINE_SOURCE == "pipeline"
112+
when: never
113+
- if: $CI_PIPELINE_SOURCE == "schedule"
114+
- if: $CI_COMMIT_REF_NAME == "master"
115+
109116
.publish-refs: &publish-refs
110117
rules:
111118
- if: $CI_PIPELINE_SOURCE == "pipeline"
112119
when: never
113120
- if: $CI_PIPELINE_SOURCE == "schedule"
121+
- if: $CI_PIPELINE_SOURCE == "web" &&
122+
$CI_COMMIT_REF_NAME == "master"
114123
- if: $CI_COMMIT_REF_NAME == "master"
124+
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
115125

116126
.build-push-image: &build-push-image
117127
<<: *kubernetes-env
@@ -266,6 +276,22 @@ build-malus:
266276
- echo "polkadot-test-malus = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
267277
- cp -r ./scripts/* ./artifacts
268278

279+
build-staking-miner:
280+
stage: stage1
281+
<<: *collect-artifacts
282+
<<: *docker-env
283+
<<: *compiler-info
284+
<<: *common-refs
285+
script:
286+
- time cargo build --locked --release --package staking-miner
287+
# pack artifacts
288+
- mkdir -p ./artifacts
289+
- mv ./target/release/staking-miner ./artifacts/.
290+
- echo -n "${CI_COMMIT_REF_NAME}" > ./artifacts/VERSION
291+
- echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
292+
- echo "staking-miner = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
293+
- cp -r ./scripts/* ./artifacts
294+
269295
#### stage: stage2
270296

271297
.check-dependent-project: &check-dependent-project
@@ -286,6 +312,7 @@ build-malus:
286312
--dependent-repo "$DEPENDENT_REPO"
287313
--github-api-token "$GITHUB_PR_TOKEN"
288314
--extra-dependencies "$EXTRA_DEPENDENCIES"
315+
--companion-overrides "$COMPANION_OVERRIDES"
289316

290317
check-dependent-cumulus:
291318
<<: *check-dependent-project
@@ -424,6 +451,23 @@ publish-malus-image:
424451
# this artifact is used in zombienet-tests job
425452
dotenv: ./artifacts/malus.env
426453

454+
publish-staking-miner-image:
455+
stage: stage2
456+
<<: *build-push-image
457+
<<: *publish-refs
458+
variables:
459+
<<: *image-variables
460+
# scripts/ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
461+
DOCKERFILE: ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
462+
IMAGE_NAME: docker.io/paritytech/staking-miner
463+
GIT_STRATEGY: none
464+
DOCKER_USER: ${Docker_Hub_User_Parity}
465+
DOCKER_PASS: ${Docker_Hub_Pass_Parity}
466+
needs:
467+
- job: build-staking-miner
468+
artifacts: true
469+
470+
427471
publish-s3-release: &publish-s3
428472
stage: stage3
429473
needs:
@@ -586,7 +630,7 @@ deploy-parity-testnet:
586630
needs:
587631
- job: test-deterministic-wasm
588632
artifacts: false
589-
<<: *publish-refs
633+
<<: *deploy-testnet-refs
590634
variables:
591635
POLKADOT_CI_COMMIT_NAME: "${CI_COMMIT_REF_NAME}"
592636
POLKADOT_CI_COMMIT_REF: "${CI_COMMIT_SHORT_SHA}"
@@ -684,9 +728,9 @@ zombienet-tests-parachains-disputes:
684728

685729
zombienet-test-parachains-upgrade-smoke-test:
686730
stage: stage3
687-
image: "${ZOMBIENET_IMAGE}"
688731
<<: *kubernetes-env
689732
<<: *zombienet-refs
733+
image: "docker.io/paritytech/zombienet:v1.2.45"
690734
needs:
691735
- job: publish-polkadot-debug-image
692736
- job: publish-malus-image
@@ -695,12 +739,12 @@ zombienet-test-parachains-upgrade-smoke-test:
695739
GH_DIR: 'https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke'
696740
before_script:
697741
- echo "ZombieNet Tests Config"
698-
- echo "docker.io/parity/polkadot:latest"
742+
- echo "${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}"
699743
- echo "docker.io/parity/polkadot-collator:latest"
700744
- echo "${ZOMBIENET_IMAGE}"
701745
- echo "${GH_DIR}"
702746
- export DEBUG=zombie,zombie::network-node
703-
- export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest" # Use polkadot latest image
747+
- export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
704748
- export COL_IMAGE="docker.io/parity/polkadot-collator:latest" # Use cumulus lastest image
705749
script:
706750
- /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh

0 commit comments

Comments
 (0)