companion for #13384 (#6987)

* companion for #13384

* adjust parsing RPC address from process output

* update rpc cli

* update lockfile for {"substrate"}

* bump zombienet v1.3.48

* bump zombienet version

* allow zombienet-tests-misc-upgrade-node to fail

* add comment and issue link to allowed_failure

* grumbles: disable failed job

* disabled the correct test

---------

Co-authored-by: parity-processbot <>
Co-authored-by: Javier Viola <javier@parity.io>
This commit is contained in:
Niklas Adolfsson
2023-05-04 11:48:08 +02:00
committed by GitHub
parent 615366dba7
commit dcbf8b70f7
5 changed files with 227 additions and 229 deletions
+1 -1
View File
@@ -38,7 +38,7 @@ variables:
BUILDAH_COMMAND: "buildah --storage-driver overlay2"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.43"
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.49"
default:
cache: {}
+184 -183
View File
File diff suppressed because it is too large Load Diff
+5 -9
View File
@@ -190,18 +190,14 @@ pub fn node_config(
offchain_worker: sc_client_api::ExecutionStrategy::NativeWhenPossible,
other: sc_client_api::ExecutionStrategy::NativeWhenPossible,
},
rpc_http: None,
rpc_ws: None,
rpc_ipc: None,
rpc_max_payload: None,
rpc_max_request_size: None,
rpc_max_response_size: None,
rpc_ws_max_connections: None,
rpc_addr: Default::default(),
rpc_max_request_size: Default::default(),
rpc_max_response_size: Default::default(),
rpc_max_connections: Default::default(),
rpc_cors: None,
rpc_methods: Default::default(),
rpc_id_provider: None,
rpc_max_subs_per_conn: None,
ws_max_out_buffer_capacity: None,
rpc_max_subs_per_conn: Default::default(),
prometheus_config: None,
telemetry_endpoints: None,
default_heap_pages: None,
@@ -149,7 +149,7 @@ zombienet-test-parachains-upgrade-smoke-test:
- /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
--github-remote-dir="${GH_DIR}"
--test="0002-parachains-upgrade-smoke-test.zndsl"
allow_failure: true
allow_failure: false
retry: 2
tags:
- zombienet-polkadot-integration-test
@@ -183,37 +183,40 @@ zombienet-tests-misc-paritydb:
tags:
- zombienet-polkadot-integration-test
zombienet-tests-misc-upgrade-node:
stage: zombienet
image: "${ZOMBIENET_IMAGE}"
extends:
- .kubernetes-env
- .zombienet-refs
needs:
- job: publish-polkadot-debug-image
- job: publish-test-collators-image
- job: build-linux-stable
artifacts: true
variables:
GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc"
before_script:
- echo "Zombie-net Tests Config"
- echo "${ZOMBIENET_IMAGE_NAME}"
- echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
- echo "${GH_DIR}"
- export DEBUG=zombie,zombie::network-node
- export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest"
- export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
- BUILD_LINUX_JOB_ID="$(cat ./artifacts/BUILD_LINUX_JOB_ID)"
- export POLKADOT_PR_BIN_URL="https://gitlab.parity.io/parity/mirrors/polkadot/-/jobs/${BUILD_LINUX_JOB_ID}/artifacts/raw/artifacts/polkadot"
script:
- /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
--github-remote-dir="${GH_DIR}"
--test="0002-upgrade-node.zndsl"
allow_failure: false
retry: 2
tags:
- zombienet-polkadot-integration-test
## TODO: https://github.com/paritytech/polkadot/issues/7177
## This is temporarily because it's currently broken
##
# zombienet-tests-misc-upgrade-node:
# stage: zombienet
# image: "${ZOMBIENET_IMAGE}"
# extends:
# - .kubernetes-env
# - .zombienet-refs
# needs:
# - job: publish-polkadot-debug-image
# - job: publish-test-collators-image
# - job: build-linux-stable
# artifacts: true
# variables:
# GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc"
# before_script:
# - echo "Zombie-net Tests Config"
# - echo "${ZOMBIENET_IMAGE_NAME}"
# - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
# - echo "${GH_DIR}"
# - export DEBUG=zombie,zombie::network-node
# - export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest"
# - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
# - BUILD_LINUX_JOB_ID="$(cat ./artifacts/BUILD_LINUX_JOB_ID)"
# - export POLKADOT_PR_BIN_URL="https://gitlab.parity.io/parity/mirrors/polkadot/-/jobs/${BUILD_LINUX_JOB_ID}/artifacts/raw/artifacts/polkadot"
# script:
# - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
# --github-remote-dir="${GH_DIR}"
# --test="0002-upgrade-node.zndsl"
# allow_failure: true
# retry: 2
# tags:
# - zombienet-polkadot-integration-test
zombienet-tests-malus-dispute-valid:
stage: zombienet
+2 -4
View File
@@ -89,15 +89,13 @@ pub fn find_ws_url_from_output(read: impl Read + Send) -> (String, String) {
data.push_str(&line);
// does the line contain our port (we expect this specific output from substrate).
let sock_addr = match line.split_once("Running JSON-RPC WS server: addr=") {
let sock_addr = match line.split_once("Running JSON-RPC server: addr=") {
None => return None,
Some((_, after)) => after.split_once(',').unwrap().0,
};
Some(format!("ws://{}", sock_addr))
})
.unwrap_or_else(|| {
panic!("Could not find WebSocket address in process output:\n{}", &data)
});
.unwrap_or_else(|| panic!("Could not find address in process output:\n{}", &data));
(ws_url, data)
}