diff --git a/.github/actions/zombienet-sdk/action.yml b/.github/actions/zombienet-sdk/action.yml index 21ef90be69636..ab52ea7dca5eb 100644 --- a/.github/actions/zombienet-sdk/action.yml +++ b/.github/actions/zombienet-sdk/action.yml @@ -21,12 +21,6 @@ inputs: runs: using: "composite" steps: - - name: k8s_auth - shell: bash - run: | - . /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh - k8s_auth - - name: common_vars shell: bash env: @@ -61,6 +55,7 @@ runs: TEST_NAME: ${{ inputs.test }} PREFIX: ${{ inputs.prefix }} run: | + export ZOMBIE_K8S_CI_NAMESPACE=$(cat /data/namespace) ls -ltr ./artifacts cargo nextest run --archive-file ./artifacts/${PREFIX}-zombienet-tests.tar.zst --no-capture -- ${TEST_NAME} diff --git a/.github/actions/zombienet/action.yml b/.github/actions/zombienet/action.yml index 4c34e06b050e7..85f2de2e79ad0 100644 --- a/.github/actions/zombienet/action.yml +++ b/.github/actions/zombienet/action.yml @@ -14,12 +14,6 @@ inputs: runs: using: "composite" steps: - - name: k8s_auth - shell: bash - run: | - . /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh - k8s_auth - - name: common_vars shell: bash env: @@ -42,6 +36,7 @@ runs: LOCAL_PATH: ${{ inputs.local-dir }} CONCURRENCY: ${{ inputs.concurrency }} run: | + export ZOMBIE_K8S_CI_NAMESPACE=$(cat /data/namespace) /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \ --local-dir="$(pwd)/$LOCAL_PATH" \ --concurrency=$CONCURRENCY \ diff --git a/.github/workflows/zombienet_cumulus.yml b/.github/workflows/zombienet_cumulus.yml index e3a7eab060087..1d7c78afc9669 100644 --- a/.github/workflows/zombienet_cumulus.yml +++ b/.github/workflows/zombienet_cumulus.yml @@ -17,6 +17,13 @@ env: FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1 LOCAL_DIR: "./cumulus/zombienet/tests" GHA_CLUSTER_SERVER_ADDR: "https://kubernetes.default:443" + # use spot by default + X_INFRA_INSTANCE: "spot" + # don't retry sdk tests + NEXTEST_RETRIES: 0 + KUBECONFIG: "/data/config" + ZOMBIE_CLEANER_DISABLED: 1 + # only run if we have changes in [subtrate, cumulus, polkadot] directories or this workflow. jobs: diff --git a/.github/workflows/zombienet_substrate.yml b/.github/workflows/zombienet_substrate.yml index 3e1d02e2037c2..13105136d4969 100644 --- a/.github/workflows/zombienet_substrate.yml +++ b/.github/workflows/zombienet_substrate.yml @@ -17,6 +17,13 @@ env: FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1 LOCAL_DIR: "./substrate/zombienet" GHA_CLUSTER_SERVER_ADDR: "https://kubernetes.default:443" + # use spot by default + X_INFRA_INSTANCE: "spot" + # don't retry sdk tests + NEXTEST_RETRIES: 0 + KUBECONFIG: "/data/config" + ZOMBIE_CLEANER_DISABLED: 1 + # DB generated from commit: https://github.com/paritytech/polkadot-sdk/commit/868788a5bff3ef94869bd36432726703fe3b4e96 # TODO: As a workaround for https://github.com/paritytech/polkadot-sdk/issues/2568 the DB was generated in archive mode. diff --git a/.github/zombienet-env b/.github/zombienet-env index 92a6b2d5b412b..163364b2885ae 100644 --- a/.github/zombienet-env +++ b/.github/zombienet-env @@ -1,5 +1,5 @@ -ZOMBIENET_IMAGE=docker.io/paritytech/zombienet:v1.3.126 -ZOMBIENET_RUNNER=zombienet-arc-runner +ZOMBIENET_IMAGE=docker.io/paritytech/zombienet:v1.3.132 +ZOMBIENET_RUNNER=parity-zombienet PUSHGATEWAY_URL=http://prometheus-pushgateway.monitoring.svc.cluster.local:9091/metrics/job/zombie-metrics DEBUG=zombie,zombie::network-node,zombie::kube::client::logs ZOMBIE_PROVIDER=k8s diff --git a/Cargo.lock b/Cargo.lock index 3fe7bb2f3f251..514e23cc17456 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28728,9 +28728,9 @@ dependencies = [ [[package]] name = "zombienet-configuration" -version = "0.3.0" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aabc9bb61ba954616b2d480a1a42eae0fdc6322c701f7b61a3836796eeed178" +checksum = "42e734ceb92e298b509dd757c55607d1715e07ab3379e48d84f6880082b8d49c" dependencies = [ "anyhow", "lazy_static", @@ -28749,9 +28749,9 @@ dependencies = [ [[package]] name = "zombienet-orchestrator" -version = "0.3.0" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006806f36101abc07822b55513e3009f00f7a48a3e708de909aad4749a6cfe70" +checksum = "c9ae1ccac7bf93c94b458bca8ab9f43e000ad99be95f5c103f044b60f6561b5d" dependencies = [ "anyhow", "async-trait", @@ -28782,9 +28782,9 @@ dependencies = [ [[package]] name = "zombienet-prom-metrics-parser" -version = "0.3.0" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f1646c6c0968033d3808bfa91674f6a31f149491020bdbff3ad7e1d9ad0237" +checksum = "f54a3dc97fa80db5278603d16e0b5156ab534cbc0f30e2116c16424622ecbe4e" dependencies = [ "pest", "pest_derive", @@ -28793,9 +28793,9 @@ dependencies = [ [[package]] name = "zombienet-provider" -version = "0.3.0" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3feea6d1ac0e3e4f2724e386c3034ee10af2afc7168dde9f091337ad2218ace5" +checksum = "77a8cc8dd76e23460a0e8d33ad3e9747a91854a499c07dc2bc6ee18248df3e59" dependencies = [ "anyhow", "async-trait", @@ -28824,9 +28824,9 @@ dependencies = [ [[package]] name = "zombienet-sdk" -version = "0.3.0" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc3ec1a08203cf2b96c5ecc84ae8c850ec0c744f4e682abd79b2846f981e5c2" +checksum = "4f1f20ac187b9591649a4efea38acc7b93f93fb79d843bc00a591d7bf55a3ff9" dependencies = [ "async-trait", "futures", @@ -28842,9 +28842,9 @@ dependencies = [ [[package]] name = "zombienet-support" -version = "0.3.0" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e057e2debab330e5a1a7d37bec91c260fd1486666a926074919c222c364ed67" +checksum = "944d1bbd9c4063c7c88ac4531410ea1b197ae7d05fd83992738095d495b053f1" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 414068a02ee62..ed9bab372237c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1464,8 +1464,8 @@ xcm-runtime-apis = { path = "polkadot/xcm/xcm-runtime-apis", default-features = xcm-simulator = { path = "polkadot/xcm/xcm-simulator", default-features = false } yet-another-parachain-runtime = { path = "cumulus/parachains/runtimes/testing/yet-another-parachain" } zeroize = { version = "1.7.0", default-features = false } -zombienet-orchestrator = { version = "0.3.0" } -zombienet-sdk = { version = "0.3.0" } +zombienet-orchestrator = { version = "0.3.6" } +zombienet-sdk = { version = "0.3.6" } zstd = { version = "0.12.4", default-features = false } [profile.release]