From ddc3a6ff101f76f0875a267d07e097d007e4bacb Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 2 Oct 2024 11:42:11 +0200
Subject: [PATCH 01/41] [WIP] Move CI from Gitlab to GitHub
---
.github/workflows/integration-tests.yml | 62 +++++++++++++++++++++++++
.gitlab-ci.yml | 41 ++++------------
2 files changed, 71 insertions(+), 32 deletions(-)
create mode 100644 .github/workflows/integration-tests.yml
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
new file mode 100644
index 000000000..af47c5e0b
--- /dev/null
+++ b/.github/workflows/integration-tests.yml
@@ -0,0 +1,62 @@
+name: Zombienet Integration Tests
+
+on:
+ push:
+ branches:
+ - main
+ pull_request:
+ types: [opened, synchronize, reopened, ready_for_review]
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
+permissions: {}
+
+env:
+ IMAGE_NAME: paritypr/zombienet
+ VERSION: ${{ github.sha }}
+
+jobs:
+ build_image:
+ name: Check that the image can be build
+ runs-on: ubuntu-latest
+ timeout-minutes: 30
+ steps:
+ - name: Check out the repo
+ uses: actions/checkout@v4
+
+ - name: Build and push Docker image from main
+ uses: docker/build-push-action@v5
+ with:
+ context: .
+ file: ./scripts/ci/docker/zombienet_injected.Dockerfile
+ push: false
+ tags: |
+ ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
+ ${{ env.IMAGE_NAME }}:latest
+
+ build_push_image:
+ name: Push Docker image to Docker Hub
+ runs-on: ubuntu-latest
+ timeout-minutes: 30
+ needs: [build_image]
+ steps:
+ - name: Check out the repo
+ uses: actions/checkout@v4
+
+ # - name: Log in to Docker Hub
+ # uses: docker/login-action@v3
+ # with:
+ # username: ${{ secrets.DOCKERHUB_USER }}
+ # password: ${{ secrets.DOCKERHUB_PASS }}
+
+ # - name: Build and push Docker image from main
+ # uses: docker/build-push-action@v5
+ # with:
+ # context: .
+ # file: ./Dockerfile
+ # push: true
+ # tags: |
+ # ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
+ # ${{ env.IMAGE_NAME }}:latest
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5c9eddb1..e0708279e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,6 @@ stages:
- publish
- zombienet
-
variables:
CI_IMAGE: "node:18"
DOCKERFILE: scripts/ci/docker/zombienet_injected.Dockerfile
@@ -31,13 +30,13 @@ variables:
cache:
- key:
files:
- - javascript/package-lock.json
+ - javascript/package-lock.json
- paths:
- - javascript/packages/cli/dist
- - javascript/packages/orchestrator/dist
- - javascript/packages/utils/dist
- - javascript/package.json
- - javascript/package-lock.json
+ - 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
@@ -51,9 +50,9 @@ cache:
- if: $CI_PIPELINE_SOURCE == "schedule"
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
- changes:
- - javascript/**/*
- - tests/**/*
- - crates/**/*
+ - javascript/**/*
+ - tests/**/*
+ - crates/**/*
# run jobs always
.common-refs: &common-refs
@@ -72,26 +71,6 @@ cache:
- if: $CI_COMMIT_REF_NAME == "main"
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-test:
- stage: test
- <<: *kubernetes-env
- <<: *common-refs
- script:
- - cd javascript
- - npm install
- # - npm run test
- - echo testme
-
-build:
- stage: build
- <<: *kubernetes-env
- <<: *common-refs
- script:
- - cd javascript
- - npm install
- - npm run clean
- - npm run build
-
# template task for building and pushing an image
.build-push-docker-image: &build-push-docker-image
script:
@@ -174,7 +153,6 @@ publish-docker-image-description:
script:
- cd / && sh entrypoint.sh
-
.zombienet-common:
before_script:
- echo "Zombienet Tests Config"
@@ -287,4 +265,3 @@ chaos-delay:
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
--local-dir="${LOCAL_DIR}"
--test="0001-delay.zndsl"
-
From aca1286ed7294229ba32755552e751a6fac6de2a Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 2 Oct 2024 12:01:55 +0200
Subject: [PATCH 02/41] upd version
---
.github/workflows/integration-tests.yml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index af47c5e0b..b388b3dc3 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -19,15 +19,15 @@ env:
jobs:
build_image:
- name: Check that the image can be build
+ name: Build image
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Check out the repo
- uses: actions/checkout@v4
+ uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
- name: Build and push Docker image from main
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
context: .
file: ./scripts/ci/docker/zombienet_injected.Dockerfile
@@ -37,13 +37,14 @@ jobs:
${{ env.IMAGE_NAME }}:latest
build_push_image:
- name: Push Docker image to Docker Hub
+ name: Build and Push Docker image to Docker Hub
runs-on: ubuntu-latest
timeout-minutes: 30
needs: [build_image]
steps:
- name: Check out the repo
- uses: actions/checkout@v4
+ uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
+
# - name: Log in to Docker Hub
# uses: docker/login-action@v3
@@ -52,7 +53,7 @@ jobs:
# password: ${{ secrets.DOCKERHUB_PASS }}
# - name: Build and push Docker image from main
- # uses: docker/build-push-action@v5
+ # uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
# with:
# context: .
# file: ./Dockerfile
From cfe957148a690476d2a10863fdfe82d6944e7a56 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 2 Oct 2024 12:04:07 +0200
Subject: [PATCH 03/41] disable checkout
---
.github/workflows/integration-tests.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index b388b3dc3..bcafbf93c 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -23,13 +23,13 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- - name: Check out the repo
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
+ # - name: Check out the repo
+ # uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
- name: Build and push Docker image from main
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
- context: .
+ # context: .
file: ./scripts/ci/docker/zombienet_injected.Dockerfile
push: false
tags: |
From fd2365189fa10275847702db4b864cd84adef7ce Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 2 Oct 2024 12:08:50 +0200
Subject: [PATCH 04/41] debug
---
scripts/ci/docker/zombienet_injected.Dockerfile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts/ci/docker/zombienet_injected.Dockerfile b/scripts/ci/docker/zombienet_injected.Dockerfile
index 5a41a38fa..43e9b218a 100644
--- a/scripts/ci/docker/zombienet_injected.Dockerfile
+++ b/scripts/ci/docker/zombienet_injected.Dockerfile
@@ -46,6 +46,10 @@ COPY javascript/package-lock.json ./
RUN npm install --production
RUN chown -R nonroot. /home/nonroot
+#debug
+
+RUN ls -la /home/nonroot
+
# Change `cli` permissions and link to easy call
RUN chmod +x /home/nonroot/zombie-net/packages/cli/dist/cli.js
RUN ln -s /home/nonroot/zombie-net/packages/cli/dist/cli.js /usr/local/bin/zombie
From be7d285828b7587a6fb2eef862aa03db088253b7 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 2 Oct 2024 12:11:08 +0200
Subject: [PATCH 05/41] more debug
---
scripts/ci/docker/zombienet_injected.Dockerfile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts/ci/docker/zombienet_injected.Dockerfile b/scripts/ci/docker/zombienet_injected.Dockerfile
index 43e9b218a..66a131a94 100644
--- a/scripts/ci/docker/zombienet_injected.Dockerfile
+++ b/scripts/ci/docker/zombienet_injected.Dockerfile
@@ -49,6 +49,10 @@ RUN chown -R nonroot. /home/nonroot
#debug
RUN ls -la /home/nonroot
+RUN ls -la /home/nonroot/zombie-net
+RUN ls -la /home/nonroot/zombie-net/packages
+RUN ls -la /home/nonroot/zombie-net/packages/cli
+RUN ls -la /home/nonroot/zombie-net/packages/cli/dist
# Change `cli` permissions and link to easy call
RUN chmod +x /home/nonroot/zombie-net/packages/cli/dist/cli.js
From 0ce065b1017d8a82c008062cdad023384f1339f2 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 2 Oct 2024 17:25:58 +0200
Subject: [PATCH 06/41] try buildah
---
.github/workflows/integration-tests.yml | 27 +++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index bcafbf93c..a0728b73c 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -26,15 +26,26 @@ jobs:
# - name: Check out the repo
# uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
- - name: Build and push Docker image from main
- uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+ - name: Build and Push Docker Image
+ uses: paritytech/build-n-push-action@main
with:
- # context: .
- file: ./scripts/ci/docker/zombienet_injected.Dockerfile
- push: false
- tags: |
- ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
- ${{ env.IMAGE_NAME }}:latest
+ push_to_registry: "false"
+ image_name: ${{ env.IMAGE_NAME }}
+ dockerfile_path: "./scripts/ci/docker/zombienet_injected.Dockerfile"
+ build_args: | # optional
+ ARG1=value1
+ ARG2=value2
+ context: "./path/to/context" # optional, defaults to '.'
+
+ # - name: Build and push Docker image from main
+ # uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+ # with:
+ # # context: .
+ # file: ./scripts/ci/docker/zombienet_injected.Dockerfile
+ # push: false
+ # tags: |
+ # ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
+ # ${{ env.IMAGE_NAME }}:latest
build_push_image:
name: Build and Push Docker image to Docker Hub
From a1f91d5f9937ada6ceffe257db92b6ebf36a7f12 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 2 Oct 2024 17:26:26 +0200
Subject: [PATCH 07/41] rm unused arg
---
.github/workflows/integration-tests.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index a0728b73c..3e029e54e 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -32,10 +32,6 @@ jobs:
push_to_registry: "false"
image_name: ${{ env.IMAGE_NAME }}
dockerfile_path: "./scripts/ci/docker/zombienet_injected.Dockerfile"
- build_args: | # optional
- ARG1=value1
- ARG2=value2
- context: "./path/to/context" # optional, defaults to '.'
# - name: Build and push Docker image from main
# uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
From 5a1b211114c83ba51b56f8d3bf37ea2f5e722e84 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 2 Oct 2024 17:30:04 +0200
Subject: [PATCH 08/41] back to docker
---
.github/workflows/integration-tests.yml | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 3e029e54e..309023244 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -26,22 +26,16 @@ jobs:
# - name: Check out the repo
# uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
- - name: Build and Push Docker Image
- uses: paritytech/build-n-push-action@main
+ #docker/build-push-action has a built-in checkout
+ - name: Build and push Docker image from main
+ uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
- push_to_registry: "false"
- image_name: ${{ env.IMAGE_NAME }}
- dockerfile_path: "./scripts/ci/docker/zombienet_injected.Dockerfile"
-
- # - name: Build and push Docker image from main
- # uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
- # with:
- # # context: .
- # file: ./scripts/ci/docker/zombienet_injected.Dockerfile
- # push: false
- # tags: |
- # ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
- # ${{ env.IMAGE_NAME }}:latest
+ # context: .
+ file: ./scripts/ci/docker/zombienet_injected.Dockerfile
+ push: false
+ tags: |
+ ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
+ ${{ env.IMAGE_NAME }}:latest
build_push_image:
name: Build and Push Docker image to Docker Hub
From 9da4ed7bfd3da3ce170f443d754c8ea30df2a0e0 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 2 Oct 2024 17:34:04 +0200
Subject: [PATCH 09/41] find
---
scripts/ci/docker/zombienet_injected.Dockerfile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/ci/docker/zombienet_injected.Dockerfile b/scripts/ci/docker/zombienet_injected.Dockerfile
index 66a131a94..23edd3e42 100644
--- a/scripts/ci/docker/zombienet_injected.Dockerfile
+++ b/scripts/ci/docker/zombienet_injected.Dockerfile
@@ -52,7 +52,10 @@ RUN ls -la /home/nonroot
RUN ls -la /home/nonroot/zombie-net
RUN ls -la /home/nonroot/zombie-net/packages
RUN ls -la /home/nonroot/zombie-net/packages/cli
-RUN ls -la /home/nonroot/zombie-net/packages/cli/dist
+
+RUN find / -name dist
+
+# RUN ls -la /home/nonroot/zombie-net/packages/cli/dist
# Change `cli` permissions and link to easy call
RUN chmod +x /home/nonroot/zombie-net/packages/cli/dist/cli.js
From 02eee3f85b527098984d44293856304da6c93288 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 2 Oct 2024 17:41:28 +0200
Subject: [PATCH 10/41] fix postinstall
---
javascript/package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/javascript/package.json b/javascript/package.json
index d9e69f71f..671814613 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -24,7 +24,7 @@
"package:macos:arm64": "npm run -w packages/cli package:macos:arm64",
"zombie": "node ./packages/cli/dist/cli.js",
"test": "npm run test --workspaces --if-present",
- "postinstall": "if [[ -f .husky/post-install.js ]]; then cd .. && node javascript/.husky/post-install.js; fi"
+ "postinstall": "bash -c 'if [[ -f .husky/post-install.js ]]; then cd .. && node javascript/.husky/post-install.js; fi'"
},
"engines": {
"node": ">=18"
@@ -55,4 +55,4 @@
"packages/orchestrator",
"packages/cli"
]
-}
+}
\ No newline at end of file
From 05bd0c7d8b25d12ff383317dc84f23e288aa3efe Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 2 Oct 2024 17:43:06 +0200
Subject: [PATCH 11/41] change context
---
.github/workflows/integration-tests.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 309023244..e4797b1a1 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -30,7 +30,7 @@ jobs:
- name: Build and push Docker image from main
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
- # context: .
+ context: ./javascript
file: ./scripts/ci/docker/zombienet_injected.Dockerfile
push: false
tags: |
From 341c4223b61e59d6f7a8d43ae1bbf55f29cdb7ad Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 2 Oct 2024 17:45:01 +0200
Subject: [PATCH 12/41] rm context
---
.github/workflows/integration-tests.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index e4797b1a1..4e9951da7 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -30,7 +30,6 @@ jobs:
- name: Build and push Docker image from main
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
- context: ./javascript
file: ./scripts/ci/docker/zombienet_injected.Dockerfile
push: false
tags: |
From 939a648ed24cb1dbf2c74d4486516d089bbe9ee8 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Fri, 4 Oct 2024 14:47:52 +0200
Subject: [PATCH 13/41] use other Docker
---
.github/workflows/integration-tests.yml | 2 +-
.gitlab-ci.yml | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 4e9951da7..27f74d4bf 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -30,7 +30,7 @@ jobs:
- name: Build and push Docker image from main
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
- file: ./scripts/ci/docker/zombienet_injected.Dockerfile
+ file: ./scripts/ci/docker/zombienet_builder.Dockerfile
push: false
tags: |
${{ env.IMAGE_NAME }}:${{ env.VERSION }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0708279e..d9962eb70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,6 +71,16 @@ cache:
- if: $CI_COMMIT_REF_NAME == "main"
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
+build:
+ stage: build
+ <<: *kubernetes-env
+ <<: *common-refs
+ script:
+ - cd javascript
+ - npm install
+ - npm run clean
+ - npm run build
+
# template task for building and pushing an image
.build-push-docker-image: &build-push-docker-image
script:
From 8446aa1fe7d90fb6a0badb07cbd6d3a4ad3fb655 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Fri, 4 Oct 2024 14:52:16 +0200
Subject: [PATCH 14/41] npm build
---
.github/workflows/integration-tests.yml | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 27f74d4bf..6487e9490 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -23,14 +23,21 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- # - name: Check out the repo
- # uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
+ - name: Check out the repo
+ uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
+ - name: npm build
+ run: |
+ cd javascript
+ npm install
+ npm run clean
+ npm run build
+ # working-directory: ./javascript
#docker/build-push-action has a built-in checkout
- name: Build and push Docker image from main
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
- file: ./scripts/ci/docker/zombienet_builder.Dockerfile
+ file: ./scripts/ci/docker/zombienet_injected.Dockerfile
push: false
tags: |
${{ env.IMAGE_NAME }}:${{ env.VERSION }}
From 78bddd06451d6f847d8b884bfd887ec2c6e71744 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Fri, 4 Oct 2024 14:58:54 +0200
Subject: [PATCH 15/41] ls
---
.github/workflows/integration-tests.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 6487e9490..e0f88ddcd 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -32,6 +32,7 @@ jobs:
npm install
npm run clean
npm run build
+ ls -la packages/cli/dist/cli.js
# working-directory: ./javascript
#docker/build-push-action has a built-in checkout
- name: Build and push Docker image from main
From c91a0783c7a3de080d1fea438cf2968585c490c2 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Fri, 4 Oct 2024 16:14:33 +0200
Subject: [PATCH 16/41] use context
---
.github/workflows/integration-tests.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index e0f88ddcd..6e69d5b12 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -33,12 +33,12 @@ jobs:
npm run clean
npm run build
ls -la packages/cli/dist/cli.js
- # working-directory: ./javascript
- #docker/build-push-action has a built-in checkout
+
- name: Build and push Docker image from main
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
file: ./scripts/ci/docker/zombienet_injected.Dockerfile
+ context: .
push: false
tags: |
${{ env.IMAGE_NAME }}:${{ env.VERSION }}
From e79855a10e76cef074f86a51eef0b7c5024fd931 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Fri, 4 Oct 2024 16:39:30 +0200
Subject: [PATCH 17/41] test push
---
.github/workflows/integration-tests.yml | 37 ++++++++++++++-----------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 6e69d5b12..8605beb76 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -32,9 +32,8 @@ jobs:
npm install
npm run clean
npm run build
- ls -la packages/cli/dist/cli.js
- - name: Build and push Docker image from main
+ - name: Build Docker image
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
file: ./scripts/ci/docker/zombienet_injected.Dockerfile
@@ -53,19 +52,25 @@ jobs:
- name: Check out the repo
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
+ - name: npm build
+ run: |
+ cd javascript
+ npm install
+ npm run clean
+ npm run build
- # - name: Log in to Docker Hub
- # uses: docker/login-action@v3
- # with:
- # username: ${{ secrets.DOCKERHUB_USER }}
- # password: ${{ secrets.DOCKERHUB_PASS }}
+ - name: Log in to Docker Hub
+ uses: docker/login-action@v3
+ with:
+ username: ${{ secrets.DOCKERHUB_USER }}
+ password: ${{ secrets.DOCKERHUB_PASS }}
- # - name: Build and push Docker image from main
- # uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
- # with:
- # context: .
- # file: ./Dockerfile
- # push: true
- # tags: |
- # ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
- # ${{ env.IMAGE_NAME }}:latest
+ - name: Build Docker image
+ uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+ with:
+ file: ./scripts/ci/docker/zombienet_injected.Dockerfile
+ context: .
+ push: true
+ tags: |
+ ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
+ ${{ env.IMAGE_NAME }}:latest
From 23f63c654f56a5d861e69451b3e2b14cd0b74baa Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Fri, 4 Oct 2024 16:51:41 +0200
Subject: [PATCH 18/41] rm debug
---
.github/workflows/integration-tests.yml | 31 +++++++++++++++++++
.../ci/docker/zombienet_injected.Dockerfile | 9 ------
2 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 8605beb76..282a33cd4 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -74,3 +74,34 @@ jobs:
tags: |
${{ env.IMAGE_NAME }}:${{ env.VERSION }}
${{ env.IMAGE_NAME }}:latest
+
+ # example job
+ # zombienet-smoke:
+ # name: Zombienet Smoke Tests
+ # runs-on: zombienet-polkadot-integration-test
+ # timeout-minutes: 30
+ # container:
+ # image: ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
+ # needs: [build_push_image]
+ # env:
+ # LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
+ # FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
+ # steps:
+ # - name: Check out the repo
+ # uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
+
+ # - name: smoke test
+ # run: |
+ # echo "Zombienet Tests Config"
+ # echo "${ZOMBIENET_IMAGE}"
+ # echo "${GH_DIR}"
+ # echo "${LOCAL_DIR}"
+ # export DEBUG=zombie
+ # export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/paritypr/polkadot-debug:master"
+ # export COL_IMAGE="docker.io/paritypr/colander:master"
+ # TODO: add script to get latest from dockerhub
+ # export CUMULUS_TEST_IMAGE="docker.io/paritypr/test-parachain:c90f9713b5bc73a9620b2e72b226b4d11e018190"
+ # echo "relay_image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
+ # echo "col_image ${COL_IMAGE}"
+
+ # /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="${LOCAL_DIR}" --test="0001-smoke.zndsl"
diff --git a/scripts/ci/docker/zombienet_injected.Dockerfile b/scripts/ci/docker/zombienet_injected.Dockerfile
index 23edd3e42..2a318f918 100644
--- a/scripts/ci/docker/zombienet_injected.Dockerfile
+++ b/scripts/ci/docker/zombienet_injected.Dockerfile
@@ -46,15 +46,6 @@ COPY javascript/package-lock.json ./
RUN npm install --production
RUN chown -R nonroot. /home/nonroot
-#debug
-
-RUN ls -la /home/nonroot
-RUN ls -la /home/nonroot/zombie-net
-RUN ls -la /home/nonroot/zombie-net/packages
-RUN ls -la /home/nonroot/zombie-net/packages/cli
-
-RUN find / -name dist
-
# RUN ls -la /home/nonroot/zombie-net/packages/cli/dist
# Change `cli` permissions and link to easy call
From aebded41d1758722098e0428103b7d176b572d3c Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Thu, 10 Oct 2024 12:37:58 +0200
Subject: [PATCH 19/41] bump versions and dedupe
---
.github/workflows/integration-tests.yml | 2 ++
scripts/ci/docker/zombienet_injected.Dockerfile | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 282a33cd4..8774f3e20 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -30,6 +30,7 @@ jobs:
run: |
cd javascript
npm install
+ npm dedupe
npm run clean
npm run build
@@ -56,6 +57,7 @@ jobs:
run: |
cd javascript
npm install
+ npm dedupe
npm run clean
npm run build
diff --git a/scripts/ci/docker/zombienet_injected.Dockerfile b/scripts/ci/docker/zombienet_injected.Dockerfile
index 2a318f918..616e1a87c 100644
--- a/scripts/ci/docker/zombienet_injected.Dockerfile
+++ b/scripts/ci/docker/zombienet_injected.Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/node:18-bullseye-slim
+FROM docker.io/library/node:20-bullseye-slim
LABEL io.parity.image.authors="devops-team@parity.io" \
io.parity.image.vendor="Parity Technologies" \
@@ -62,11 +62,11 @@ RUN chown -R nonroot. /etc/zombie-net
USER nonroot
# install rust
-ENV RUST_VERSION=1.75.0
+ENV RUST_VERSION=1.80.0
RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain $RUST_VERSION -y
ENV PATH $PATH:/home/nonroot/.cargo/bin
# install nextest
-RUN cargo install cargo-nextest --locked
+RUN cargo install cargo-nextest --locked
# Tini allows us to avoid several Docker edge cases, see https://github.com/krallin/tini.
ENTRYPOINT ["tini", "--", "bash"]
From d774228f3ccc728633e3e7054a217e8032ef8e3c Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Thu, 10 Oct 2024 12:45:34 +0200
Subject: [PATCH 20/41] lint
---
javascript/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/javascript/package.json b/javascript/package.json
index 671814613..904655287 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -55,4 +55,4 @@
"packages/orchestrator",
"packages/cli"
]
-}
\ No newline at end of file
+}
From e96168884cae50d6905bbe10e7726f783cab42f1 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 4 Dec 2024 15:45:43 +0100
Subject: [PATCH 21/41] try example job
---
.github/workflows/integration-tests.yml | 67 +++++++++++++++----------
1 file changed, 40 insertions(+), 27 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 8774f3e20..a57c9bbdb 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -77,33 +77,46 @@ jobs:
${{ env.IMAGE_NAME }}:${{ env.VERSION }}
${{ env.IMAGE_NAME }}:latest
+ set-variables:
+ name: Set variables
+ runs-on: parity-default
+ outputs:
+ VERSION: ${{ steps.version.outputs.IMAGE }}
+ steps:
+ - name: Define version
+ id: version
+ run: |
+ export IMAGE="${{ env.IMAGE_NAME }}:${{ env.VERSION }}"
+ echo "IMAGE=${IMAGE}" >> $GITHUB_OUTPUT
+ echo "set IMAGE=${IMAGE}"
+
# example job
- # zombienet-smoke:
- # name: Zombienet Smoke Tests
- # runs-on: zombienet-polkadot-integration-test
- # timeout-minutes: 30
- # container:
- # image: ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
- # needs: [build_push_image]
- # env:
- # LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
- # FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
- # steps:
- # - name: Check out the repo
- # uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
+ zombienet-smoke:
+ name: Zombienet Smoke Tests
+ runs-on: ubuntu-latest
+ timeout-minutes: 30
+ container:
+ image: ${{ needs.set-variables.outputs.VERSION }}
+ needs: [build_push_image, set-variables]
+ env:
+ LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
+ FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
+ steps:
+ - name: Check out the repo
+ uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
- # - name: smoke test
- # run: |
- # echo "Zombienet Tests Config"
- # echo "${ZOMBIENET_IMAGE}"
- # echo "${GH_DIR}"
- # echo "${LOCAL_DIR}"
- # export DEBUG=zombie
- # export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/paritypr/polkadot-debug:master"
- # export COL_IMAGE="docker.io/paritypr/colander:master"
- # TODO: add script to get latest from dockerhub
- # export CUMULUS_TEST_IMAGE="docker.io/paritypr/test-parachain:c90f9713b5bc73a9620b2e72b226b4d11e018190"
- # echo "relay_image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
- # echo "col_image ${COL_IMAGE}"
+ - name: smoke test
+ run: |
+ echo "Zombienet Tests Config"
+ echo "${ZOMBIENET_IMAGE}"
+ echo "${GH_DIR}"
+ echo "${LOCAL_DIR}"
+ export DEBUG=zombie
+ export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/paritypr/polkadot-debug:master"
+ export COL_IMAGE="docker.io/paritypr/colander:master"
+ TODO: add script to get latest from dockerhub
+ export CUMULUS_TEST_IMAGE="docker.io/paritypr/test-parachain:c90f9713b5bc73a9620b2e72b226b4d11e018190"
+ echo "relay_image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
+ echo "col_image ${COL_IMAGE}"
- # /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="${LOCAL_DIR}" --test="0001-smoke.zndsl"
+ /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="${LOCAL_DIR}" --test="0001-smoke.zndsl"
From 6ec7ad38c5b01cd5ef070a3c1c62e8d768b0df74 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 4 Dec 2024 15:46:31 +0100
Subject: [PATCH 22/41] usu ubuntu runner
---
.github/workflows/integration-tests.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index a57c9bbdb..c5ba371f0 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -79,7 +79,7 @@ jobs:
set-variables:
name: Set variables
- runs-on: parity-default
+ runs-on: ubuntu-latest
outputs:
VERSION: ${{ steps.version.outputs.IMAGE }}
steps:
From 3f29429937ed8eeb2356160dabb3302796681a98 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 4 Dec 2024 17:48:14 +0100
Subject: [PATCH 23/41] comment nonroot
---
.github/workflows/integration-tests.yml | 2 +-
scripts/ci/docker/zombienet_injected.Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index c5ba371f0..2313c7a1d 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -114,7 +114,7 @@ jobs:
export DEBUG=zombie
export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/paritypr/polkadot-debug:master"
export COL_IMAGE="docker.io/paritypr/colander:master"
- TODO: add script to get latest from dockerhub
+ # TODO: add script to get latest from dockerhub
export CUMULUS_TEST_IMAGE="docker.io/paritypr/test-parachain:c90f9713b5bc73a9620b2e72b226b4d11e018190"
echo "relay_image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
echo "col_image ${COL_IMAGE}"
diff --git a/scripts/ci/docker/zombienet_injected.Dockerfile b/scripts/ci/docker/zombienet_injected.Dockerfile
index 616e1a87c..94bcc8070 100644
--- a/scripts/ci/docker/zombienet_injected.Dockerfile
+++ b/scripts/ci/docker/zombienet_injected.Dockerfile
@@ -59,7 +59,7 @@ RUN mkdir -p /etc/zombie-net
RUN chown -R nonroot. /etc/zombie-net
# Use the non-root user to run our application
-USER nonroot
+# USER nonroot
# install rust
ENV RUST_VERSION=1.80.0
From bfedee66a9e89f14d3744da13a8db335b06fe8a3 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 4 Dec 2024 17:55:28 +0100
Subject: [PATCH 24/41] rm nonroot
---
.github/workflows/integration-tests.yml | 48 +++++++++----------
.../ci/docker/zombienet_injected.Dockerfile | 21 ++++----
2 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 2313c7a1d..df501a75d 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -18,37 +18,37 @@ env:
VERSION: ${{ github.sha }}
jobs:
- build_image:
- name: Build image
- runs-on: ubuntu-latest
- timeout-minutes: 30
- steps:
- - name: Check out the repo
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
+ # build_image:
+ # name: Build image
+ # runs-on: ubuntu-latest
+ # timeout-minutes: 30
+ # steps:
+ # - name: Check out the repo
+ # uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
- - name: npm build
- run: |
- cd javascript
- npm install
- npm dedupe
- npm run clean
- npm run build
+ # - name: npm build
+ # run: |
+ # cd javascript
+ # npm install
+ # npm dedupe
+ # npm run clean
+ # npm run build
- - name: Build Docker image
- uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
- with:
- file: ./scripts/ci/docker/zombienet_injected.Dockerfile
- context: .
- push: false
- tags: |
- ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
- ${{ env.IMAGE_NAME }}:latest
+ # - name: Build Docker image
+ # uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
+ # with:
+ # file: ./scripts/ci/docker/zombienet_injected.Dockerfile
+ # context: .
+ # push: false
+ # tags: |
+ # ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
+ # ${{ env.IMAGE_NAME }}:latest
build_push_image:
name: Build and Push Docker image to Docker Hub
runs-on: ubuntu-latest
timeout-minutes: 30
- needs: [build_image]
+ # needs: [build_image]
steps:
- name: Check out the repo
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
diff --git a/scripts/ci/docker/zombienet_injected.Dockerfile b/scripts/ci/docker/zombienet_injected.Dockerfile
index 94bcc8070..f60647ea7 100644
--- a/scripts/ci/docker/zombienet_injected.Dockerfile
+++ b/scripts/ci/docker/zombienet_injected.Dockerfile
@@ -29,13 +29,14 @@ RUN gcloud components install kubectl
#
# Static GID/UID is also useful for chown'ing files outside the container where
# such a user does not exist.
-RUN groupadd --gid 10001 nonroot && \
- useradd --home-dir /home/nonroot \
- --create-home \
- --shell /bin/bash \
- --gid nonroot \
- --groups nonroot \
- --uid 10000 nonroot
+
+# RUN groupadd --gid 10001 nonroot && \
+# useradd --home-dir /home/nonroot \
+# --create-home \
+# --shell /bin/bash \
+# --gid nonroot \
+# --groups nonroot \
+# --uid 10000 nonroot
WORKDIR /home/nonroot/zombie-net
COPY javascript/packages ./packages
@@ -44,7 +45,7 @@ COPY tests ./tests
COPY javascript/package.json ./
COPY javascript/package-lock.json ./
RUN npm install --production
-RUN chown -R nonroot. /home/nonroot
+# RUN chown -R nonroot. /home/nonroot
# RUN ls -la /home/nonroot/zombie-net/packages/cli/dist
@@ -54,9 +55,9 @@ RUN ln -s /home/nonroot/zombie-net/packages/cli/dist/cli.js /usr/local/bin/zombi
# Dependency for run test script when run inside container
RUN mkdir -p /var/log/zombie-net
-RUN chown -R nonroot. /var/log/zombie-net
+# RUN chown -R nonroot. /var/log/zombie-net
RUN mkdir -p /etc/zombie-net
-RUN chown -R nonroot. /etc/zombie-net
+# RUN chown -R nonroot. /etc/zombie-net
# Use the non-root user to run our application
# USER nonroot
From d2b11e3035b7c74f06edf81b019c43253fef9a12 Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 4 Dec 2024 18:05:07 +0100
Subject: [PATCH 25/41] mkdir
---
.github/workflows/integration-tests.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index df501a75d..c243cc4de 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -118,5 +118,6 @@ jobs:
export CUMULUS_TEST_IMAGE="docker.io/paritypr/test-parachain:c90f9713b5bc73a9620b2e72b226b4d11e018190"
echo "relay_image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
echo "col_image ${COL_IMAGE}"
+ mkdip -p ${{ env.LOCAL_DIR }}
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="${LOCAL_DIR}" --test="0001-smoke.zndsl"
From ea21a310c98c1b943fb7451d7f4014b1a36a0ccb Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 4 Dec 2024 18:12:57 +0100
Subject: [PATCH 26/41] typo
---
.github/workflows/integration-tests.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index c243cc4de..4374aa391 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -118,6 +118,6 @@ jobs:
export CUMULUS_TEST_IMAGE="docker.io/paritypr/test-parachain:c90f9713b5bc73a9620b2e72b226b4d11e018190"
echo "relay_image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
echo "col_image ${COL_IMAGE}"
- mkdip -p ${{ env.LOCAL_DIR }}
+ mkdir -p ${{ env.LOCAL_DIR }}
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="${LOCAL_DIR}" --test="0001-smoke.zndsl"
From a7621974f08e62e22b83464f0a85da763157234a Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 4 Dec 2024 18:29:39 +0100
Subject: [PATCH 27/41] fix local dir
---
.github/workflows/integration-tests.yml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 4374aa391..4a6986dcc 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -93,13 +93,13 @@ jobs:
# example job
zombienet-smoke:
name: Zombienet Smoke Tests
- runs-on: ubuntu-latest
+ runs-on: zombienet-arc-runner
timeout-minutes: 30
container:
image: ${{ needs.set-variables.outputs.VERSION }}
needs: [build_push_image, set-variables]
env:
- LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
+ # LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
steps:
- name: Check out the repo
@@ -110,7 +110,7 @@ jobs:
echo "Zombienet Tests Config"
echo "${ZOMBIENET_IMAGE}"
echo "${GH_DIR}"
- echo "${LOCAL_DIR}"
+ # echo "${LOCAL_DIR}"
export DEBUG=zombie
export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/paritypr/polkadot-debug:master"
export COL_IMAGE="docker.io/paritypr/colander:master"
@@ -118,6 +118,5 @@ jobs:
export CUMULUS_TEST_IMAGE="docker.io/paritypr/test-parachain:c90f9713b5bc73a9620b2e72b226b4d11e018190"
echo "relay_image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
echo "col_image ${COL_IMAGE}"
- mkdir -p ${{ env.LOCAL_DIR }}
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="${LOCAL_DIR}" --test="0001-smoke.zndsl"
+ /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="$(pwd)/tests" --test="0001-smoke.zndsl"
From 7e5468c90c5e2ba8355144c74124732e5818ec1e Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Wed, 4 Dec 2024 19:12:24 +0100
Subject: [PATCH 28/41] run in container
---
.github/workflows/integration-tests.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 4a6986dcc..5d468ab7b 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -100,6 +100,7 @@ jobs:
needs: [build_push_image, set-variables]
env:
# LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
+ RUN_IN_CONTAINER: 1
FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
steps:
- name: Check out the repo
From 8565e6bcfc9d4dcc8b9d54c5bf2206e6de1e5454 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Thu, 5 Dec 2024 16:44:52 +0100
Subject: [PATCH 29/41] fix to run in gha
---
.github/workflows/integration-tests.yml | 1 +
scripts/ci/run-test-local-env-manager.sh | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 5d468ab7b..308fd1544 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -102,6 +102,7 @@ jobs:
# LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
RUN_IN_CONTAINER: 1
FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
+ GHA_CLUSTER_SERVER_ADDR: "https://kubernetes.default:443"
steps:
- name: Check out the repo
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
diff --git a/scripts/ci/run-test-local-env-manager.sh b/scripts/ci/run-test-local-env-manager.sh
index ab9e724a1..0a90eca45 100755
--- a/scripts/ci/run-test-local-env-manager.sh
+++ b/scripts/ci/run-test-local-env-manager.sh
@@ -148,8 +148,15 @@ function set_instance_env {
function run_test {
# RUN_IN_CONTAINER is env var that is set in the dockerfile
if [[ -v RUN_IN_CONTAINER ]]; then
- gcloud auth activate-service-account --key-file "${GOOGLE_CREDENTIALS}"
- gcloud container clusters get-credentials parity-zombienet --zone europe-west3-b --project parity-zombienet
+ if [[ -v GHA_CLUSTER_SERVER_ADDR ]]; then
+ kubectl config set-cluster parity-zombienet --server="${GHA_CLUSTER_SERVER_ADDR}" --certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+ kubectl config set-credentials pod-token --token="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)"
+ kubectl config set-context pod-context --cluster=parity-zombienet --user=pod-token
+ kubectl config use-context pod-context
+ else
+ gcloud auth activate-service-account --key-file "${GOOGLE_CREDENTIALS}"
+ gcloud container clusters get-credentials parity-zombienet --zone europe-west3-b --project parity-zombienet
+ fi;
fi
cd "${OUTPUT_DIR}"
set -x
From cd5b1553b4806965c508b63e8a706f04f5e8a60e Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Thu, 5 Dec 2024 19:12:37 +0100
Subject: [PATCH 30/41] allow networking from arc-runners
---
.../orchestrator/static-configs/namespace-network-policy.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/javascript/packages/orchestrator/static-configs/namespace-network-policy.yaml b/javascript/packages/orchestrator/static-configs/namespace-network-policy.yaml
index a2e043178..c3bdc799b 100644
--- a/javascript/packages/orchestrator/static-configs/namespace-network-policy.yaml
+++ b/javascript/packages/orchestrator/static-configs/namespace-network-policy.yaml
@@ -13,6 +13,7 @@ spec:
values:
- {{namespace}}
- gitlab
+ - arc-runners
- loki
- tempo
- monitoring
From 5f34ea902e9a1d3aa93ec4554d9163000fbfc0c1 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Fri, 6 Dec 2024 10:26:32 +0100
Subject: [PATCH 31/41] add more tests
---
.github/workflows/integration-tests.yml | 94 +++++++++++++++++++++----
1 file changed, 82 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 308fd1544..05fb8b274 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -16,6 +16,9 @@ permissions: {}
env:
IMAGE_NAME: paritypr/zombienet
VERSION: ${{ github.sha }}
+ RUN_IN_CONTAINER: 1
+ FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
+ GHA_CLUSTER_SERVER_ADDR: "https://kubernetes.default:443"
jobs:
# build_image:
@@ -89,8 +92,13 @@ jobs:
export IMAGE="${{ env.IMAGE_NAME }}:${{ env.VERSION }}"
echo "IMAGE=${IMAGE}" >> $GITHUB_OUTPUT
echo "set IMAGE=${IMAGE}"
+ export DEBUG=zombie
+ export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/paritypr/polkadot-debug:master"
+ export COL_IMAGE="docker.io/paritypr/colander:master"
+ # TODO: add script to get latest from dockerhub
+ export CUMULUS_TEST_IMAGE="docker.io/paritypr/test-parachain:c90f9713b5bc73a9620b2e72b226b4d11e018190"
+
- # example job
zombienet-smoke:
name: Zombienet Smoke Tests
runs-on: zombienet-arc-runner
@@ -98,27 +106,89 @@ jobs:
container:
image: ${{ needs.set-variables.outputs.VERSION }}
needs: [build_push_image, set-variables]
- env:
+ #env:
# LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
- RUN_IN_CONTAINER: 1
- FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
- GHA_CLUSTER_SERVER_ADDR: "https://kubernetes.default:443"
steps:
- name: Check out the repo
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
- name: smoke test
run: |
- echo "Zombienet Tests Config"
+ echo "Zombienet Tests"
echo "${ZOMBIENET_IMAGE}"
echo "${GH_DIR}"
- # echo "${LOCAL_DIR}"
- export DEBUG=zombie
- export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/paritypr/polkadot-debug:master"
- export COL_IMAGE="docker.io/paritypr/colander:master"
- # TODO: add script to get latest from dockerhub
- export CUMULUS_TEST_IMAGE="docker.io/paritypr/test-parachain:c90f9713b5bc73a9620b2e72b226b4d11e018190"
echo "relay_image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
echo "col_image ${COL_IMAGE}"
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="$(pwd)/tests" --test="0001-smoke.zndsl"
+
+ zombienet-scale-net-config:
+ name: Zombienet Scale net
+ runs-on: zombienet-arc-runner
+ timeout-minutes: 30
+ container:
+ image: ${{ needs.set-variables.outputs.VERSION }}
+ needs: [build_push_image, set-variables]
+ #env:
+ # LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
+ steps:
+ - name: Check out the repo
+ uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
+
+ - name: scale-net test
+ run: |
+ echo "Zombienet Scale Net"
+ echo "${ZOMBIENET_IMAGE}"
+ echo "${GH_DIR}"
+ echo "relay_image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
+ echo "col_image ${COL_IMAGE}"
+
+ /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="$(pwd)/tests/scale-net" --test="0001-scale-net.zndsl"
+
+ zombienet-upgrade-node:
+ name: Zombienet Upgrade Node
+ runs-on: zombienet-arc-runner
+ timeout-minutes: 30
+ container:
+ image: ${{ needs.set-variables.outputs.VERSION }}
+ needs: [build_push_image, set-variables]
+ #env:
+ # LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
+ steps:
+ - name: Check out the repo
+ uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
+
+ - name: upgrade node test
+ run: |
+ echo "Zombienet Upgrade Node"
+ echo "${ZOMBIENET_IMAGE}"
+ echo "${GH_DIR}"
+ export COL_IMAGE="docker.io/paritypr/colander:4519"
+ echo "relay_image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
+ echo "col_image ${COL_IMAGE}"
+
+ /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="$(pwd)/tests/k8s" --test="0001-upgrade-node.zndsl"
+
+
+ zombienet-chaos-delay:
+ name: Zombienet Upgrade Node
+ runs-on: zombienet-arc-runner
+ timeout-minutes: 30
+ container:
+ image: ${{ needs.set-variables.outputs.VERSION }}
+ needs: [build_push_image, set-variables]
+ #env:
+ # LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
+ steps:
+ - name: Check out the repo
+ uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
+
+ - name: chaos-delay test
+ run: |
+ echo "Zombienet Chaos Delay"
+ echo "${ZOMBIENET_IMAGE}"
+ echo "${GH_DIR}"
+ echo "relay_image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
+ echo "col_image ${COL_IMAGE}"
+
+ /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="$(pwd)/tests/chaos" --test="0001-delay.zndsl"
From a5de127993e43ff3b6f45f751c64e62683313e06 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Fri, 6 Dec 2024 10:51:02 +0100
Subject: [PATCH 32/41] fix set env
---
.github/workflows/integration-tests.yml | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 05fb8b274..046791de6 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -93,14 +93,21 @@ jobs:
echo "IMAGE=${IMAGE}" >> $GITHUB_OUTPUT
echo "set IMAGE=${IMAGE}"
export DEBUG=zombie
+ echo "DEBUG=${DEBUG}" >> $GITHUB_OUTPUT
+ echo "set DEBUG=${DEBUG}"
export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/paritypr/polkadot-debug:master"
+ echo "ZOMBIENET_INTEGRATION_TEST_IMAGE=${ZOMBIENET_INTEGRATION_TEST_IMAGE}" >> $GITHUB_OUTPUT
+ echo "set ZOMBIENET_INTEGRATION_TEST_IMAGE=${ZOMBIENET_INTEGRATION_TEST_IMAGE}
export COL_IMAGE="docker.io/paritypr/colander:master"
+ echo "COL_IMAGE=${COL_IMAGE}" >> $GITHUB_OUTPUT
+ echo "set COL_IMAGE=${COL_IMAGE}"
# TODO: add script to get latest from dockerhub
export CUMULUS_TEST_IMAGE="docker.io/paritypr/test-parachain:c90f9713b5bc73a9620b2e72b226b4d11e018190"
-
+ echo "CUMULUS_TEST_IMAGE=${CUMULUS_TEST_IMAGE}" >> $GITHUB_OUTPUT
+ echo "set CUMULUS_TEST_IMAGE=${CUMULUS_TEST_IMAGE}"
zombienet-smoke:
- name: Zombienet Smoke Tests
+ name: Zombienet Smoke
runs-on: zombienet-arc-runner
timeout-minutes: 30
container:
@@ -171,7 +178,7 @@ jobs:
zombienet-chaos-delay:
- name: Zombienet Upgrade Node
+ name: Zombienet Chaos Delay
runs-on: zombienet-arc-runner
timeout-minutes: 30
container:
From edbb8dc83b72d495760fa7bb11560bba89cd801c Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Fri, 6 Dec 2024 10:52:59 +0100
Subject: [PATCH 33/41] typo
---
.github/workflows/integration-tests.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 046791de6..b31dbb126 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -97,7 +97,7 @@ jobs:
echo "set DEBUG=${DEBUG}"
export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/paritypr/polkadot-debug:master"
echo "ZOMBIENET_INTEGRATION_TEST_IMAGE=${ZOMBIENET_INTEGRATION_TEST_IMAGE}" >> $GITHUB_OUTPUT
- echo "set ZOMBIENET_INTEGRATION_TEST_IMAGE=${ZOMBIENET_INTEGRATION_TEST_IMAGE}
+ echo "set ZOMBIENET_INTEGRATION_TEST_IMAGE=${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
export COL_IMAGE="docker.io/paritypr/colander:master"
echo "COL_IMAGE=${COL_IMAGE}" >> $GITHUB_OUTPUT
echo "set COL_IMAGE=${COL_IMAGE}"
From a6b795d551ab4914ac221839ed7d78ae6e5c3530 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Fri, 6 Dec 2024 11:03:54 +0100
Subject: [PATCH 34/41] upload logs
---
.github/workflows/integration-tests.yml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index b31dbb126..ef1b827d3 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -129,6 +129,13 @@ jobs:
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="$(pwd)/tests" --test="0001-smoke.zndsl"
+ - name: upload logs
+ uses: actions/upload-artifact@v4
+ with:
+ name: zombienet-logs
+ path: |
+ /tmp/zombie*/logs/*
+
zombienet-scale-net-config:
name: Zombienet Scale net
runs-on: zombienet-arc-runner
From 96b51ac286b888f5854a43123b28aec665aa0cdb Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Fri, 6 Dec 2024 12:24:01 +0100
Subject: [PATCH 35/41] refactor
---
.github/workflows/integration-tests.yml | 31 +++++++++++++++++++++----
1 file changed, 27 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index ef1b827d3..db158632e 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -85,6 +85,10 @@ jobs:
runs-on: ubuntu-latest
outputs:
VERSION: ${{ steps.version.outputs.IMAGE }}
+ DEBUG: ${{ steps.env.outputs.DEBUG }}
+ ZOMBIENET_INTEGRATION_TEST_IMAGE: ${{ steps.env.outputs.ZOMBIENET_INTEGRATION_TEST_IMAGE }}
+ COL_IMAGE: ${{ steps.env.outputs.COL_IMAGE }}
+ CUMULUS_TEST_IMAGE: ${{ steps.env.outputs.CUMULUS_TEST_IMAGE }}
steps:
- name: Define version
id: version
@@ -92,6 +96,9 @@ jobs:
export IMAGE="${{ env.IMAGE_NAME }}:${{ env.VERSION }}"
echo "IMAGE=${IMAGE}" >> $GITHUB_OUTPUT
echo "set IMAGE=${IMAGE}"
+ - name: Define env
+ id: env
+ run: |
export DEBUG=zombie
echo "DEBUG=${DEBUG}" >> $GITHUB_OUTPUT
echo "set DEBUG=${DEBUG}"
@@ -113,8 +120,12 @@ jobs:
container:
image: ${{ needs.set-variables.outputs.VERSION }}
needs: [build_push_image, set-variables]
- #env:
+ env:
# LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
+ DEBUG: ${{ needs.set-variables.outputs.DEBUG }}
+ ZOMBIENET_INTEGRATION_TEST_IMAGE: ${{ needs.set-variables.outputs.ZOMBIENET_INTEGRATION_TEST_IMAGE }}
+ COL_IMAGE: ${{ needs.set-variables.outputs.COL_IMAGE }}
+ CUMULUS_TEST_IMAGE: ${{ needs.set-variables.outputs.CUMULUS_TEST_IMAGE }}
steps:
- name: Check out the repo
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
@@ -143,8 +154,12 @@ jobs:
container:
image: ${{ needs.set-variables.outputs.VERSION }}
needs: [build_push_image, set-variables]
- #env:
+ env:
# LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
+ DEBUG: ${{ needs.set-variables.outputs.DEBUG }}
+ ZOMBIENET_INTEGRATION_TEST_IMAGE: ${{ needs.set-variables.outputs.ZOMBIENET_INTEGRATION_TEST_IMAGE }}
+ COL_IMAGE: ${{ needs.set-variables.outputs.COL_IMAGE }}
+ CUMULUS_TEST_IMAGE: ${{ needs.set-variables.outputs.CUMULUS_TEST_IMAGE }}
steps:
- name: Check out the repo
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
@@ -166,8 +181,12 @@ jobs:
container:
image: ${{ needs.set-variables.outputs.VERSION }}
needs: [build_push_image, set-variables]
- #env:
+ env:
# LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
+ DEBUG: ${{ needs.set-variables.outputs.DEBUG }}
+ ZOMBIENET_INTEGRATION_TEST_IMAGE: ${{ needs.set-variables.outputs.ZOMBIENET_INTEGRATION_TEST_IMAGE }}
+ COL_IMAGE: ${{ needs.set-variables.outputs.COL_IMAGE }}
+ CUMULUS_TEST_IMAGE: ${{ needs.set-variables.outputs.CUMULUS_TEST_IMAGE }}
steps:
- name: Check out the repo
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
@@ -191,8 +210,12 @@ jobs:
container:
image: ${{ needs.set-variables.outputs.VERSION }}
needs: [build_push_image, set-variables]
- #env:
+ env:
# LOCAL_DIR: "/builds/parity/mirrors/zombienet/tests"
+ DEBUG: ${{ needs.set-variables.outputs.DEBUG }}
+ ZOMBIENET_INTEGRATION_TEST_IMAGE: ${{ needs.set-variables.outputs.ZOMBIENET_INTEGRATION_TEST_IMAGE }}
+ COL_IMAGE: ${{ needs.set-variables.outputs.COL_IMAGE }}
+ CUMULUS_TEST_IMAGE: ${{ needs.set-variables.outputs.CUMULUS_TEST_IMAGE }}
steps:
- name: Check out the repo
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v.4.2.0
From e97da8376c9531be0f1a60ed1c3417caa0ab2dd7 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Fri, 6 Dec 2024 13:02:45 +0100
Subject: [PATCH 36/41] more debug on reruns
---
.github/workflows/integration-tests.yml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index db158632e..3659bb2f9 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -99,7 +99,12 @@ jobs:
- name: Define env
id: env
run: |
- export DEBUG=zombie
+ if [[ ${{ github.run_attempt }} -gt 1 ]]; then
+ # more debug in rerun
+ export DEBUG=zombie*
+ else
+ export DEBUG=zombie*
+ fi;
echo "DEBUG=${DEBUG}" >> $GITHUB_OUTPUT
echo "set DEBUG=${DEBUG}"
export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/paritypr/polkadot-debug:master"
From fd96540f2758d3cc2ba7972d9044b35905fd7ca3 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Fri, 6 Dec 2024 16:06:15 +0100
Subject: [PATCH 37/41] less debug
---
.github/workflows/integration-tests.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 3659bb2f9..1ce9f4912 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -101,7 +101,7 @@ jobs:
run: |
if [[ ${{ github.run_attempt }} -gt 1 ]]; then
# more debug in rerun
- export DEBUG=zombie*
+ export DEBUG=zombie,zombie::js-helpers*,zombie::paras,zombie::network-node,zombie::kube::client::logs
else
export DEBUG=zombie*
fi;
From 82cc91dda4010c77a121d0ad75c96ad280fac0aa Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Mon, 9 Dec 2024 10:54:52 +0100
Subject: [PATCH 38/41] less debug
---
.github/workflows/integration-tests.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 1ce9f4912..b657f3e96 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -101,7 +101,7 @@ jobs:
run: |
if [[ ${{ github.run_attempt }} -gt 1 ]]; then
# more debug in rerun
- export DEBUG=zombie,zombie::js-helpers*,zombie::paras,zombie::network-node,zombie::kube::client::logs
+ export DEBUG=zombie,zombie::js-helpers*,zombie::network-node,zombie::kube::client::logs
else
export DEBUG=zombie*
fi;
From e3d9d7522fc5e54242ec6f047e06fc814a70e183 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Mon, 9 Dec 2024 11:25:36 +0100
Subject: [PATCH 39/41] typo
---
.github/workflows/integration-tests.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index b657f3e96..c6b64387a 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -103,7 +103,7 @@ jobs:
# more debug in rerun
export DEBUG=zombie,zombie::js-helpers*,zombie::network-node,zombie::kube::client::logs
else
- export DEBUG=zombie*
+ export DEBUG=zombie
fi;
echo "DEBUG=${DEBUG}" >> $GITHUB_OUTPUT
echo "set DEBUG=${DEBUG}"
From e390e98641ee65d24010027bcba2f93287bcc1be Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Mon, 9 Dec 2024 12:06:07 +0100
Subject: [PATCH 40/41] add logs to ci
---
.github/workflows/integration-tests.yml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index c6b64387a..bf032445d 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -179,6 +179,13 @@ jobs:
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="$(pwd)/tests/scale-net" --test="0001-scale-net.zndsl"
+ - name: upload logs
+ uses: actions/upload-artifact@v4
+ with:
+ name: zombienet-logs
+ path: |
+ /tmp/zombie*/logs/*
+
zombienet-upgrade-node:
name: Zombienet Upgrade Node
runs-on: zombienet-arc-runner
@@ -207,6 +214,12 @@ jobs:
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="$(pwd)/tests/k8s" --test="0001-upgrade-node.zndsl"
+ - name: upload logs
+ uses: actions/upload-artifact@v4
+ with:
+ name: zombienet-logs
+ path: |
+ /tmp/zombie*/logs/*
zombienet-chaos-delay:
name: Zombienet Chaos Delay
@@ -234,3 +247,10 @@ jobs:
echo "col_image ${COL_IMAGE}"
/home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="$(pwd)/tests/chaos" --test="0001-delay.zndsl"
+
+ - name: upload logs
+ uses: actions/upload-artifact@v4
+ with:
+ name: zombienet-logs
+ path: |
+ /tmp/zombie*/logs/*
From 66b7127ce5c20374bb4cf117690a2c2efbcefb53 Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Mon, 9 Dec 2024 12:21:50 +0100
Subject: [PATCH 41/41] change logs names
---
.github/workflows/integration-tests.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index bf032445d..7280d376c 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -148,7 +148,7 @@ jobs:
- name: upload logs
uses: actions/upload-artifact@v4
with:
- name: zombienet-logs
+ name: zombienet-logs-smoke
path: |
/tmp/zombie*/logs/*
@@ -182,7 +182,7 @@ jobs:
- name: upload logs
uses: actions/upload-artifact@v4
with:
- name: zombienet-logs
+ name: zombienet-logs-scale-net
path: |
/tmp/zombie*/logs/*
@@ -217,7 +217,7 @@ jobs:
- name: upload logs
uses: actions/upload-artifact@v4
with:
- name: zombienet-logs
+ name: zombienet-logs-upgrade
path: |
/tmp/zombie*/logs/*
@@ -251,6 +251,6 @@ jobs:
- name: upload logs
uses: actions/upload-artifact@v4
with:
- name: zombienet-logs
+ name: zombienet-logs-chaos
path: |
/tmp/zombie*/logs/*