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) ...
paritytech · Mar 7, 2023 · 5046c2d · 5046c2d
2 parents 1495b47 + d0419a9
commit 5046c2d
Show file tree

Hide file tree

Showing 266 changed files with 10,404 additions and 8,125 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+/.gitlab-ci.yml filter=ci-prettier
+/scripts/ci/gitlab/pipeline/*.yml filter=ci-prettier
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -29,38 +29,38 @@ workflow:
     - if: $CI_COMMIT_BRANCH
 
 variables:
-  GIT_STRATEGY:                    fetch
-  GIT_DEPTH:                       100
-  CI_SERVER_NAME:                  "GitLab CI"
-  CI_IMAGE:                        "paritytech/ci-linux:production"
-  BUILDAH_IMAGE:                   "quay.io/buildah/stable:v1.27"
-  DOCKER_OS:                       "debian:stretch"
-  ARCH:                            "x86_64"
-  ZOMBIENET_IMAGE:                 "docker.io/paritytech/zombienet:v1.2.78"
+  GIT_STRATEGY: fetch
+  GIT_DEPTH: 100
+  CI_SERVER_NAME: "GitLab CI"
+  CI_IMAGE: "paritytech/ci-linux:production"
+  BUILDAH_IMAGE: "quay.io/buildah/stable:v1.27"
+  DOCKER_OS: "debian:stretch"
+  ARCH: "x86_64"
+  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.37"
 
 default:
-  cache:                           {}
+  cache: {}
   retry:
     max: 2
     when:
       - runner_system_failure
       - unknown_failure
       - api_failure
-  interruptible:                   true
+  interruptible: true
 
 .collect-artifacts:
   artifacts:
-    name:                          "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
-    when:                          on_success
-    expire_in:                     7 days
+    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
+    when: on_success
+    expire_in: 7 days
     paths:
       - ./artifacts/
 
 .collect-artifacts-short:
   artifacts:
-    name:                          "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
-    when:                          on_success
-    expire_in:                     1 days
+    name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
+    when: on_success
+    expire_in: 1 days
     paths:
       - ./artifacts/
 
@@ -76,22 +76,22 @@ default:
 
 .pipeline-stopper-artifacts:
   artifacts:
-     reports:
-       dotenv: pipeline-stopper.env
+    reports:
+      dotenv: pipeline-stopper.env
 
 .job-switcher:
   before_script:
     - if echo "$CI_DISABLED_JOBS" | grep -xF "$CI_JOB_NAME"; then echo "The job has been cancelled in CI settings"; exit 0; fi
 
 .kubernetes-env:
-  image:                           "${CI_IMAGE}"
+  image: "${CI_IMAGE}"
   before_script:
     - !reference [.job-switcher, before_script]
   tags:
     - kubernetes-parity-build
 
 .docker-env:
-  image:                           "${CI_IMAGE}"
+  image: "${CI_IMAGE}"
   before_script:
     - !reference [.job-switcher, before_script]
   tags:
@@ -108,23 +108,23 @@ default:
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
 
 .common-refs:
   # these jobs run always*
   rules:
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
-    - if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/      # i.e. release-v0.9.27
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
+    - if: $CI_COMMIT_REF_NAME =~ /^release-v[0-9]+\.[0-9]+.*$/ # i.e. release-v0.9.27
 
 .test-pr-refs:
   rules:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
 
 .zombienet-refs:
   rules:
@@ -133,7 +133,7 @@ default:
     - if: $CI_PIPELINE_SOURCE == "schedule"
       when: never
     - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
 
 .deploy-testnet-refs:
   rules:
@@ -148,9 +148,9 @@ default:
       when: never
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_PIPELINE_SOURCE == "web" &&
-          $CI_COMMIT_REF_NAME == "master"
+        $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
+    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
 
 .build-push-image:
   before_script:
@@ -162,19 +162,19 @@ default:
     - echo "Polkadot version = ${VERSION} (EXTRATAG = ${EXTRATAG})"
   script:
     - test "$DOCKER_USER" -a "$DOCKER_PASS" ||
-        ( echo "no docker credentials provided"; exit 1 )
+      ( echo "no docker credentials provided"; exit 1 )
     - cd ./artifacts
     - buildah bud
-        --format=docker
-        --build-arg VCS_REF="${CI_COMMIT_SHA}"
-        --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
-        --build-arg IMAGE_NAME="${IMAGE_NAME}"
-        --tag "$IMAGE_NAME:$VERSION"
-        --tag "$IMAGE_NAME:$EXTRATAG"
-        --file ${DOCKERFILE} .
+      --format=docker
+      --build-arg VCS_REF="${CI_COMMIT_SHA}"
+      --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
+      --build-arg IMAGE_NAME="${IMAGE_NAME}"
+      --tag "$IMAGE_NAME:$VERSION"
+      --tag "$IMAGE_NAME:$EXTRATAG"
+      --file ${DOCKERFILE} .
     # The job will success only on the protected branch
     - echo "$DOCKER_PASS" |
-        buildah login --username "$DOCKER_USER" --password-stdin docker.io
+      buildah login --username "$DOCKER_USER" --password-stdin docker.io
     - buildah info
     - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
     - buildah push --format=v2s2 "$IMAGE_NAME:$EXTRATAG"
@@ -200,50 +200,49 @@ include:
 #### stage:                        .post
 
 deploy-parity-testnet:
-  stage:                           .post
+  stage: .post
   extends:
     - .deploy-testnet-refs
   variables:
-    POLKADOT_CI_COMMIT_NAME:       "${CI_COMMIT_REF_NAME}"
-    POLKADOT_CI_COMMIT_REF:        "${CI_COMMIT_SHORT_SHA}"
-  allow_failure:                   false
-  trigger:                         "parity/infrastructure/parity-testnet"
+    POLKADOT_CI_COMMIT_NAME: "${CI_COMMIT_REF_NAME}"
+    POLKADOT_CI_COMMIT_REF: "${CI_COMMIT_SHORT_SHA}"
+  allow_failure: false
+  trigger: "parity/infrastructure/parity-testnet"
 
 # This job cancels the whole pipeline if any of provided jobs fail.
 # In a DAG, every jobs chain is executed independently of others. The `fail_fast` principle suggests
 # to fail the pipeline as soon as possible to shorten the feedback loop.
 .cancel-pipeline-template:
-  stage:                           .post
+  stage: .post
   rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
       when: on_failure
   variables:
-    PROJECT_ID:                    "${CI_PROJECT_ID}"
-    PROJECT_NAME:                  "${CI_PROJECT_NAME}"
-    PIPELINE_ID:                   "${CI_PIPELINE_ID}"
-    FAILED_JOB_URL:                "${FAILED_JOB_URL}"
-    FAILED_JOB_NAME:               "${FAILED_JOB_NAME}"
-    PR_NUM:                        "${PR_NUM}"
+    PROJECT_ID: "${CI_PROJECT_ID}"
+    PROJECT_NAME: "${CI_PROJECT_NAME}"
+    PIPELINE_ID: "${CI_PIPELINE_ID}"
+    FAILED_JOB_URL: "${FAILED_JOB_URL}"
+    FAILED_JOB_NAME: "${FAILED_JOB_NAME}"
+    PR_NUM: "${PR_NUM}"
   trigger:
-    project:                       "parity/infrastructure/ci_cd/pipeline-stopper"
-    branch:                        "as-improve"
+    project: "parity/infrastructure/ci_cd/pipeline-stopper"
+    branch: "as-improve"
 
 remove-cancel-pipeline-message:
   stage: .post
   rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
   variables:
-    PROJECT_ID:                    "${CI_PROJECT_ID}"
-    PROJECT_NAME:                  "${CI_PROJECT_NAME}"
-    PIPELINE_ID:                   "${CI_PIPELINE_ID}"
-    FAILED_JOB_URL:                "https://gitlab.com"
-    FAILED_JOB_NAME:               "nope"
-    PR_NUM:                        "${CI_COMMIT_REF_NAME}"
+    PROJECT_ID: "${CI_PROJECT_ID}"
+    PROJECT_NAME: "${CI_PROJECT_NAME}"
+    PIPELINE_ID: "${CI_PIPELINE_ID}"
+    FAILED_JOB_URL: "https://gitlab.com"
+    FAILED_JOB_NAME: "nope"
+    PR_NUM: "${CI_COMMIT_REF_NAME}"
   trigger:
-    project:                       "parity/infrastructure/ci_cd/pipeline-stopper"
+    project: "parity/infrastructure/ci_cd/pipeline-stopper"
 
 cancel-pipeline-test-linux-stable:
-  extends:                         .cancel-pipeline-template
+  extends: .cancel-pipeline-template
   needs:
-    - job:                         test-linux-stable
-
+    - job: test-linux-stable
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		/.gitlab-ci.yml filter=ci-prettier
		/scripts/ci/gitlab/pipeline/*.yml filter=ci-prettier