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

Commit 5046c2d

Browse files
author
Andronik
committed
Merge branch 'master' into ao-past-session-slashing-client
* master: (27 commits) bump `zombienet` version to v1.3.37 (#6773) Bump `blake2b_simd` to 1.0.1 (#6829) changelog: update template for new label behavior (E3/E4) (#6804) Companion for paritytech/substrate#12828 (#6380) Don't send `ActiveLeaves` from leaves in db on startup in Overseer (#6727) Polkadot XCM Body constants (#6788) Decrease expected peer count in zombinenet tests (#6826) Additional tracing in `provisioner`, `vote_selection` and `dispute-coordinator` (#6775) Change node-key for bootnodes (#6772) Change handle_import_statements to FatalResult (#6820) Introduce XCM matcher for writing barriers (#6756) Freeze note on `SessionInfo`. (#6818) Bump parity-db (#6816) Removing Outdated References to Misbehavior Arbitration Subsystem (#6814) Forgotten re-export for `MatchedConvertedConcreteId` (#6815) Companion for substrate#13509: bump API versions of {Beefy,Mmr}Api (#6809) Migrate to `Weight::from_parts` (#6794) [XCM] Multiple `FungiblesAdapter`s support + `WeightTrader::buy_weight` more accurate error (#6739) Get rid of unnecessary cloning and work. (#6808) changelog: fix migration listing (#6806) ...
2 parents 1495b47 + d0419a9 commit 5046c2d

File tree

266 files changed

+10404
-8125
lines changed

Some content is hidden

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

266 files changed

+10404
-8125
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/.gitlab-ci.yml filter=ci-prettier
2+
/scripts/ci/gitlab/pipeline/*.yml filter=ci-prettier

.gitlab-ci.yml

Lines changed: 62 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -29,38 +29,38 @@ workflow:
2929
- if: $CI_COMMIT_BRANCH
3030

3131
variables:
32-
GIT_STRATEGY: fetch
33-
GIT_DEPTH: 100
34-
CI_SERVER_NAME: "GitLab CI"
35-
CI_IMAGE: "paritytech/ci-linux:production"
36-
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.27"
37-
DOCKER_OS: "debian:stretch"
38-
ARCH: "x86_64"
39-
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.78"
32+
GIT_STRATEGY: fetch
33+
GIT_DEPTH: 100
34+
CI_SERVER_NAME: "GitLab CI"
35+
CI_IMAGE: "paritytech/ci-linux:production"
36+
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.27"
37+
DOCKER_OS: "debian:stretch"
38+
ARCH: "x86_64"
39+
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.37"
4040

4141
default:
42-
cache: {}
42+
cache: {}
4343
retry:
4444
max: 2
4545
when:
4646
- runner_system_failure
4747
- unknown_failure
4848
- api_failure
49-
interruptible: true
49+
interruptible: true
5050

5151
.collect-artifacts:
5252
artifacts:
53-
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
54-
when: on_success
55-
expire_in: 7 days
53+
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
54+
when: on_success
55+
expire_in: 7 days
5656
paths:
5757
- ./artifacts/
5858

5959
.collect-artifacts-short:
6060
artifacts:
61-
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
62-
when: on_success
63-
expire_in: 1 days
61+
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
62+
when: on_success
63+
expire_in: 1 days
6464
paths:
6565
- ./artifacts/
6666

@@ -76,22 +76,22 @@ default:
7676

7777
.pipeline-stopper-artifacts:
7878
artifacts:
79-
reports:
80-
dotenv: pipeline-stopper.env
79+
reports:
80+
dotenv: pipeline-stopper.env
8181

8282
.job-switcher:
8383
before_script:
8484
- if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
8585

8686
.kubernetes-env:
87-
image: "${CI_IMAGE}"
87+
image: "${CI_IMAGE}"
8888
before_script:
8989
- !reference [.job-switcher, before_script]
9090
tags:
9191
- kubernetes-parity-build
9292

9393
.docker-env:
94-
image: "${CI_IMAGE}"
94+
image: "${CI_IMAGE}"
9595
before_script:
9696
- !reference [.job-switcher, before_script]
9797
tags:
@@ -108,23 +108,23 @@ default:
108108
- if: $CI_PIPELINE_SOURCE == "web"
109109
- if: $CI_PIPELINE_SOURCE == "schedule"
110110
- if: $CI_COMMIT_REF_NAME == "master"
111-
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
111+
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
112112

113113
.common-refs:
114114
# these jobs run always*
115115
rules:
116116
- if: $CI_PIPELINE_SOURCE == "web"
117117
- if: $CI_PIPELINE_SOURCE == "schedule"
118118
- if: $CI_COMMIT_REF_NAME == "master"
119-
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
120-
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
121-
- if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/ # i.e. release-v0.9.27
119+
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
120+
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
121+
- if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/ # i.e. release-v0.9.27
122122

123123
.test-pr-refs:
124124
rules:
125125
- if: $CI_PIPELINE_SOURCE == "pipeline"
126126
when: never
127-
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
127+
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
128128

129129
.zombienet-refs:
130130
rules:
@@ -133,7 +133,7 @@ default:
133133
- if: $CI_PIPELINE_SOURCE == "schedule"
134134
when: never
135135
- if: $CI_COMMIT_REF_NAME == "master"
136-
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
136+
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
137137

138138
.deploy-testnet-refs:
139139
rules:
@@ -148,9 +148,9 @@ default:
148148
when: never
149149
- if: $CI_PIPELINE_SOURCE == "schedule"
150150
- if: $CI_PIPELINE_SOURCE == "web" &&
151-
$CI_COMMIT_REF_NAME == "master"
151+
$CI_COMMIT_REF_NAME == "master"
152152
- if: $CI_COMMIT_REF_NAME == "master"
153-
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
153+
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
154154

155155
.build-push-image:
156156
before_script:
@@ -162,19 +162,19 @@ default:
162162
- echo "Polkadot version = ${VERSION} (EXTRATAG = ${EXTRATAG})"
163163
script:
164164
- test "$DOCKER_USER" -a "$DOCKER_PASS" ||
165-
( echo "no docker credentials provided"; exit 1 )
165+
( echo "no docker credentials provided"; exit 1 )
166166
- cd ./artifacts
167167
- buildah bud
168-
--format=docker
169-
--build-arg VCS_REF="${CI_COMMIT_SHA}"
170-
--build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
171-
--build-arg IMAGE_NAME="${IMAGE_NAME}"
172-
--tag "$IMAGE_NAME:$VERSION"
173-
--tag "$IMAGE_NAME:$EXTRATAG"
174-
--file ${DOCKERFILE} .
168+
--format=docker
169+
--build-arg VCS_REF="${CI_COMMIT_SHA}"
170+
--build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
171+
--build-arg IMAGE_NAME="${IMAGE_NAME}"
172+
--tag "$IMAGE_NAME:$VERSION"
173+
--tag "$IMAGE_NAME:$EXTRATAG"
174+
--file ${DOCKERFILE} .
175175
# The job will success only on the protected branch
176176
- echo "$DOCKER_PASS" |
177-
buildah login --username "$DOCKER_USER" --password-stdin docker.io
177+
buildah login --username "$DOCKER_USER" --password-stdin docker.io
178178
- buildah info
179179
- buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
180180
- buildah push --format=v2s2 "$IMAGE_NAME:$EXTRATAG"
@@ -200,50 +200,49 @@ include:
200200
#### stage: .post
201201

202202
deploy-parity-testnet:
203-
stage: .post
203+
stage: .post
204204
extends:
205205
- .deploy-testnet-refs
206206
variables:
207-
POLKADOT_CI_COMMIT_NAME: "${CI_COMMIT_REF_NAME}"
208-
POLKADOT_CI_COMMIT_REF: "${CI_COMMIT_SHORT_SHA}"
209-
allow_failure: false
210-
trigger: "parity/infrastructure/parity-testnet"
207+
POLKADOT_CI_COMMIT_NAME: "${CI_COMMIT_REF_NAME}"
208+
POLKADOT_CI_COMMIT_REF: "${CI_COMMIT_SHORT_SHA}"
209+
allow_failure: false
210+
trigger: "parity/infrastructure/parity-testnet"
211211

212212
# This job cancels the whole pipeline if any of provided jobs fail.
213213
# In a DAG, every jobs chain is executed independently of others. The `fail_fast` principle suggests
214214
# to fail the pipeline as soon as possible to shorten the feedback loop.
215215
.cancel-pipeline-template:
216-
stage: .post
216+
stage: .post
217217
rules:
218-
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
218+
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
219219
when: on_failure
220220
variables:
221-
PROJECT_ID: "${CI_PROJECT_ID}"
222-
PROJECT_NAME: "${CI_PROJECT_NAME}"
223-
PIPELINE_ID: "${CI_PIPELINE_ID}"
224-
FAILED_JOB_URL: "${FAILED_JOB_URL}"
225-
FAILED_JOB_NAME: "${FAILED_JOB_NAME}"
226-
PR_NUM: "${PR_NUM}"
221+
PROJECT_ID: "${CI_PROJECT_ID}"
222+
PROJECT_NAME: "${CI_PROJECT_NAME}"
223+
PIPELINE_ID: "${CI_PIPELINE_ID}"
224+
FAILED_JOB_URL: "${FAILED_JOB_URL}"
225+
FAILED_JOB_NAME: "${FAILED_JOB_NAME}"
226+
PR_NUM: "${PR_NUM}"
227227
trigger:
228-
project: "parity/infrastructure/ci_cd/pipeline-stopper"
229-
branch: "as-improve"
228+
project: "parity/infrastructure/ci_cd/pipeline-stopper"
229+
branch: "as-improve"
230230

231231
remove-cancel-pipeline-message:
232232
stage: .post
233233
rules:
234-
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
234+
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
235235
variables:
236-
PROJECT_ID: "${CI_PROJECT_ID}"
237-
PROJECT_NAME: "${CI_PROJECT_NAME}"
238-
PIPELINE_ID: "${CI_PIPELINE_ID}"
239-
FAILED_JOB_URL: "https://gitlab.com"
240-
FAILED_JOB_NAME: "nope"
241-
PR_NUM: "${CI_COMMIT_REF_NAME}"
236+
PROJECT_ID: "${CI_PROJECT_ID}"
237+
PROJECT_NAME: "${CI_PROJECT_NAME}"
238+
PIPELINE_ID: "${CI_PIPELINE_ID}"
239+
FAILED_JOB_URL: "https://gitlab.com"
240+
FAILED_JOB_NAME: "nope"
241+
PR_NUM: "${CI_COMMIT_REF_NAME}"
242242
trigger:
243-
project: "parity/infrastructure/ci_cd/pipeline-stopper"
243+
project: "parity/infrastructure/ci_cd/pipeline-stopper"
244244

245245
cancel-pipeline-test-linux-stable:
246-
extends: .cancel-pipeline-template
246+
extends: .cancel-pipeline-template
247247
needs:
248-
- job: test-linux-stable
249-
248+
- job: test-linux-stable

0 commit comments

Comments
 (0)