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>

polkadot/.gitlab-ci.yml

@@ -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: {}

polkadot/node/test/service/src/lib.rs

@@ -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_addr: Default::default(),
-		rpc_ws: None,
+		rpc_max_request_size: Default::default(),
-		rpc_ipc: None,
+		rpc_max_response_size: Default::default(),
-		rpc_max_payload: None,
+		rpc_max_connections: Default::default(),
-		rpc_max_request_size: None,
-		rpc_max_response_size: None,
-		rpc_ws_max_connections: None,
 		rpc_cors: None,
 		rpc_methods: Default::default(),
 		rpc_id_provider: None,
-		rpc_max_subs_per_conn: None,
+		rpc_max_subs_per_conn: Default::default(),
-		ws_max_out_buffer_capacity: None,
 		prometheus_config: None,
 		telemetry_endpoints: None,
 		default_heap_pages: None,

polkadot/scripts/ci/gitlab/pipeline/zombienet.yml

@@ -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:
+## TODO: https://github.com/paritytech/polkadot/issues/7177
-  stage: zombienet
+## This is temporarily because it's currently broken
-  image: "${ZOMBIENET_IMAGE}"
+##
-  extends:
+# zombienet-tests-misc-upgrade-node:
-    - .kubernetes-env
+#   stage: zombienet
-    - .zombienet-refs
+#   image: "${ZOMBIENET_IMAGE}"
-  needs:
+#   extends:
-    - job: publish-polkadot-debug-image
+#     - .kubernetes-env
-    - job: publish-test-collators-image
+#     - .zombienet-refs
-    - job: build-linux-stable
+#   needs:
-      artifacts: true
+#     - job: publish-polkadot-debug-image
-  variables:
+#     - job: publish-test-collators-image
-    GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc"
+#     - job: build-linux-stable
-  before_script:
+#       artifacts: true
-    - echo "Zombie-net Tests Config"
+#   variables:
-    - echo "${ZOMBIENET_IMAGE_NAME}"
+#     GH_DIR: "https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/misc"
-    - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
+#   before_script:
-    - echo "${GH_DIR}"
+#     - echo "Zombie-net Tests Config"
-    - export DEBUG=zombie,zombie::network-node
+#     - echo "${ZOMBIENET_IMAGE_NAME}"
-    - export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest"
+#     - echo "${PARACHAINS_IMAGE_NAME} ${PARACHAINS_IMAGE_TAG}"
-    - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
+#     - echo "${GH_DIR}"
-    - BUILD_LINUX_JOB_ID="$(cat ./artifacts/BUILD_LINUX_JOB_ID)"
+#     - export DEBUG=zombie,zombie::network-node
-    - export POLKADOT_PR_BIN_URL="https://gitlab.parity.io/parity/mirrors/polkadot/-/jobs/${BUILD_LINUX_JOB_ID}/artifacts/raw/artifacts/polkadot"
+#     - export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest"
-  script:
+#     - export COL_IMAGE=${COLLATOR_IMAGE_NAME}:${COLLATOR_IMAGE_TAG}
-    - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
+#     - BUILD_LINUX_JOB_ID="$(cat ./artifacts/BUILD_LINUX_JOB_ID)"
-      --github-remote-dir="${GH_DIR}"
+#     - export POLKADOT_PR_BIN_URL="https://gitlab.parity.io/parity/mirrors/polkadot/-/jobs/${BUILD_LINUX_JOB_ID}/artifacts/raw/artifacts/polkadot"
-      --test="0002-upgrade-node.zndsl"
+#   script:
-  allow_failure: false
+#     - /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
-  retry: 2
+#       --github-remote-dir="${GH_DIR}"
-  tags:
+#       --test="0002-upgrade-node.zndsl"
-    - zombienet-polkadot-integration-test
+#   allow_failure: true
+#   retry: 2
+#   tags:
+#     - zombienet-polkadot-integration-test
 
 zombienet-tests-malus-dispute-valid:
   stage: zombienet

polkadot/tests/common.rs

@@ -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(|| {
+		.unwrap_or_else(|| panic!("Could not find address in process output:\n{}", &data));
-			panic!("Could not find WebSocket address in process output:\n{}", &data)
-		});
 	(ws_url, data)
 }