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

Commit

Permalink
Merge branch 'master' into rk-collation-fixes
Browse files Browse the repository at this point in the history
* master:
  Update CI image to use the latest rustc (#4200)
  Offchain: Disable http requests (#4188)
  Update SimNet test to the new format (#4051)
  Bump libc from 0.2.105 to 0.2.106 (#4194)
  Update GHA to s3krit/matrix-message-action@v0.0.3 + doc (#4030)
  Bump dlmalloc from 0.2.1 to 0.2.2 (#4205)
  • Loading branch information
ordian committed Nov 3, 2021
2 parents e81d200 + 4fdec83 commit 3a69195
Show file tree
Hide file tree
Showing 20 changed files with 322 additions and 320 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/check-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ jobs:
check-labels:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Checkout sources
uses: actions/checkout@v2
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.ref }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/extrinsic-ordering-check-from-bin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ jobs:
REF_URL: ${{github.event.inputs.reference_url}}

steps:
- uses: actions/checkout@v2
- name: Checkout sources
uses: actions/checkout@v2

- name: Fetch binary
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/publish-docker-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Checkout sources
uses: actions/checkout@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Cache Docker layers
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/publish-draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ jobs:
matrix:
runtime: ["polkadot", "kusama", "westend"]
steps:
- uses: actions/checkout@v2
- name: Checkout sources
uses: actions/checkout@v2
- name: Cache target dir
uses: actions/cache@v2
with:
Expand Down Expand Up @@ -64,7 +65,8 @@ jobs:
release_url: ${{ steps.create-release.outputs.html_url }}
asset_upload_url: ${{ steps.create-release.outputs.upload_url }}
steps:
- uses: actions/checkout@v2
- name: Checkout sources
uses: actions/checkout@v2
with:
fetch-depth: 0
path: polkadot
Expand Down Expand Up @@ -100,8 +102,10 @@ jobs:
matrix:
runtime: ["polkadot", "kusama", "westend"]
steps:
- uses: actions/checkout@v2
- uses: actions/download-artifact@v2
- name: Checkout sources
uses: actions/checkout@v2
- name: Download artifacts
uses: actions/download-artifact@v2
- name: Set up Ruby 2.7
uses: actions/setup-ruby@v1
with:
Expand All @@ -128,7 +132,7 @@ jobs:
needs: publish-draft-release
steps:
- name: Internal polkadot channel
uses: s3krit/matrix-message-action@v0.0.2
uses: s3krit/matrix-message-action@v0.0.3
with:
room_id: ${{ secrets.INTERNAL_POLKADOT_MATRIX_ROOM_ID }}
access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ jobs:
- '!NTogofoetwjbTwOoPi:matrix.parity.io' # Internal release-notes channel
runs-on: ubuntu-latest
steps:
- uses: s3krit/matrix-message-action@v0.0.3
- name: Send Matrix message
uses: s3krit/matrix-message-action@v0.0.3
with:
room_id: ${{ matrix.channel }} # heh
access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/release-candidate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ jobs:
tag_rc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Checkout sources
uses: actions/checkout@v2
with:
fetch-depth: 0
- id: compute_tag
Expand Down Expand Up @@ -48,7 +49,8 @@ jobs:
VERSION: ${{ steps.compute_tag.outputs.version }}
with:
filename: .github/ISSUE_TEMPLATE/release.md
- uses: s3krit/matrix-message-action@v0.0.2
- name: Send Matrix message
uses: s3krit/matrix-message-action@v0.0.3
if: steps.create-issue.outputs.url != ''
with:
room_id: ${{ secrets.INTERNAL_POLKADOT_MATRIX_ROOM_ID }}
Expand Down
30 changes: 19 additions & 11 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ variables:
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}"
SIMNET_IMAGE: "europe-west3-docker.pkg.dev/parity-simnet/simnet-images/simnet:v14"
PIPELINE_SCRIPTS_TAG: "v0.1"

default:
cache: {}
Expand Down Expand Up @@ -566,8 +568,12 @@ deploy-polkasync-kusama:

simnet-tests:
stage: deploy
image: "docker.io/paritytech/simnet:${SIMNET_REF}"
image: "${SIMNET_IMAGE}"
<<: *kubernetes-env
variables:
# FIXME: change branch to "master" after merging this PR
# GH_DIR: "https://github.com/paritytech/polkadot/tree/master/simnet_tests"
GH_DIR: "https://github.com/paritytech/polkadot/tree/simnet-v10/simnet_tests"
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
- if: $CI_COMMIT_REF_NAME == "master"
Expand All @@ -584,17 +590,19 @@ simnet-tests:

# SIMNET_REF is a gitlab variable
before_script:
- echo "Simnet Tests Config
${SIMNET_IMAGE_NAME} ${SIMNET_REF}
${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}
${COLLATOR_IMAGE_NAME} ${COLLATOR_IMAGE_TAG}"
- echo "Simnet Tests Config"
- echo "${SIMNET_IMAGE}"
- echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
- echo "${COLLATOR_IMAGE_NAME} ${COLLATOR_IMAGE_TAG}"
- echo "${GH_DIR}"
script:
- /home/nonroot/simnet/gurke/scripts/run-test-environment-manager.sh
--github-remote-dir="https://github.com/paritytech/polkadot/tree/master/simnet_tests"
--config="simnet_tests/configs/simple_rococo_testnet.toml"
--image="${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}"
--image-2="${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}"
--image-simnet="docker.io/paritytech/simnet:${SIMNET_REF}"
- /home/nonroot/simnet/scripts/run-test-environment-manager-v2.sh
--github-remote-dir="${GH_DIR}"
--tag=smoketest
--image="PARACHAINSIMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}"
--image="SYNTHIMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}"
--image="COLIMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}"
--image="SCRIPTSIMAGE=${SIMNET_IMAGE}"
allow_failure: true
retry: 2
tags:
Expand Down
Loading

0 comments on commit 3a69195

Please sign in to comment.