Skip to content

Commit

Permalink
Merge branch 'main' into nik-extra-setup-binaries
Browse files Browse the repository at this point in the history
  • Loading branch information
wirednkod authored Sep 5, 2023
2 parents d5d5256 + 79a13be commit e5f5e80
Show file tree
Hide file tree
Showing 91 changed files with 3,459 additions and 831 deletions.
9 changes: 6 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# CI
/.github/ @paritytech/ci @pepoviola
/.gitlab-ci.yml @paritytech/ci @pepoviola
/scripts/ci/ @paritytech/ci @pepoviola
/.github/ @paritytech/ci @pepoviola @emamihe
/.gitlab-ci.yml @paritytech/ci @pepoviola @emamihe
/scripts/ci/ @paritytech/ci @pepoviola @emamihe

# add automatic reviewers in PRs
* @pepoviola @wirednkod @l0r1s
4 changes: 2 additions & 2 deletions .github/workflows/build-release-manual-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: setup node
Expand All @@ -39,7 +39,7 @@ jobs:
runs-on: macos-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: setup node
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: "18"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
node-version: [18.x, 19.x, 20.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Rust Stable toolchain
uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:

# steps:
# - name: Checkout repository
# uses: actions/checkout@v3
# uses: actions/checkout@v4

# - name: Setup containers registries
# run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup mdBook
uses: peaceiris/actions-mdbook@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/markdown-link-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
markdown-link-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
use-quiet-mode: "yes"
2 changes: 1 addition & 1 deletion .github/workflows/npm-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Build & Publish to NPM
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: npm install
working-directory: "./javascript"
- uses: actions/setup-node@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: setup node
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
runs-on: macos-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: setup node
Expand Down
44 changes: 24 additions & 20 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,20 @@ variables:
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
BUILDAH_COMMAND: "buildah --storage-driver overlay2"
RUN_IN_CONTAINER: "1"
# Improve gitlab cache performance
CACHE_COMPRESSION_LEVEL: "fastest"
FF_USE_FASTZIP: "true"

cache:
- key:
files:
- javascript/package-lock.json
- paths:
- javascript/packages/cli/dist
- javascript/packages/orchestrator/dist
- javascript/packages/utils/dist
- javascript/package.json
- javascript/package-lock.json

.kubernetes-env: &kubernetes-env
image: $CI_IMAGE
Expand Down Expand Up @@ -58,45 +72,25 @@ variables:
- if: $CI_COMMIT_REF_NAME == "main"
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1

# telling gitlab to collect artifacts from artifacts/ folder to path it to other jobs
.collect-artifacts: &collect-artifacts
artifacts:
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
when: on_success
expire_in: 2 days
paths:
- artifacts/

test:
stage: test
<<: *kubernetes-env
<<: *common-refs
<<: *collect-artifacts
script:
- mkdir -p artifacts
- cd javascript
- npm install
# - npm run test
- echo testme
- cp -r packages/ ../artifacts/
- cp package.json ../artifacts/
- cp package-lock.json ../artifacts/
- ls -ltr ../artifacts/*

build:
stage: build
<<: *kubernetes-env
<<: *common-refs
<<: *collect-artifacts
script:
- mkdir -p artifacts
- cd javascript
- npm install
- npm run clean
- npm run build
- cp -r packages/ ../artifacts/
- cp package.json ../artifacts/
- cp package-lock.json ../artifacts/

# template task for building and pushing an image
.build-push-docker-image: &build-push-docker-image
Expand Down Expand Up @@ -281,3 +275,13 @@ db-snapshot:
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
--local-dir="${LOCAL_DIR}"
--test="0013-db-snapshot.zndsl"

chaos-delay:
extends:
- .zombienet-common
variables:
LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests/chaos"
script:
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
--local-dir="${LOCAL_DIR}"
--test="0001-delay.zndsl"
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[workspace]

members = [ "crates/*", "backchannel" ]
exclude = ["backchannel-cli"]
exclude = ["backchannel-cli", "crates/k8s-cleaner"]
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[![GitLab Status](https://gitlab.parity.io/parity/zombienet/badges/main/pipeline.svg)](https://gitlab.parity.io/parity/zombienet/pipelines)

![ci](https://github.com/paritytech/zombienet/actions/workflows/ci.yml/badge.svg) [![GitLab Status](https://gitlab.parity.io/parity/zombienet/pipelines/pipeline.svg)](https://gitlab.parity.io/parity/zombienet/pipelines)

# Zombienet

Expand Down Expand Up @@ -126,6 +127,7 @@ Options:
-c, --spawn-concurrency <concurrency> Number of concurrent spawning process to launch, default is 1
-p, --provider <provider> Override provider to use (choices: "podman", "kubernetes", "native")
default: kubernetes
-l, --logType <logType> Type of logging on the console - defaults to 'table' (choices: "table", "text", "silent")
-d, --dir <path> Directory path for placing the network files instead of random temp one (e.g. -d /home/user/my-zombienet)
-f, --force Force override all prompt commands
-m, --monitor Start as monitor, do not auto cleanup network
Expand Down Expand Up @@ -411,7 +413,7 @@ Below can be found some of the projects that are currently using Zombienet as in
- [InvArch](https://github.com/InvArch/InvArch-Node/blob/34a6e2216bc79c9bcee2f2f4c0cd8243fe4dfc93/zombienet/rococo-and-tinkernet+basilisk.toml)
- [Mangata](https://github.com/mangata-finance/mangata-node/tree/develop/devops/zombienet)
- [Manta/Phala](https://github.com/Manta-Network/manta-indexer/pull/30)
- [Moonbeam](https://github.com/PureStake/moonbeam/tree/master/tests/zombienet)
- [Moonbeam](https://github.com/moonbeam-foundation/moonbeam/tree/master/test)
- [T3rn](https://github.com/t3rn/t3rn/tree/development/tests/zombienet)
- [ParaSpell✨](https://github.com/paraspell/ui-v2)

Expand Down
Loading

0 comments on commit e5f5e80

Please sign in to comment.