diff --git a/.github/node_upgrade_pytest.sh b/.github/node_upgrade_pytest.sh index 2c2945de9..80aab67b0 100755 --- a/.github/node_upgrade_pytest.sh +++ b/.github/node_upgrade_pytest.sh @@ -190,22 +190,22 @@ elif [ "$1" = "step2" ]; then # Restart local cluster nodes with binaries from new cluster-node version. # It is necessary to restart supervisord with new environment. - "$STATE_CLUSTER/supervisorctl" stop all + "$STATE_CLUSTER/supervisorctl_local" stop all sleep 5 "$STATE_CLUSTER/stop-cluster" sleep 3 "$STATE_CLUSTER/supervisord_start" || exit 6 sleep 5 - "$STATE_CLUSTER/supervisorctl" start all + "$STATE_CLUSTER/supervisorctl_local" start all sleep 5 - "$STATE_CLUSTER/supervisorctl" status + "$STATE_CLUSTER/supervisorctl_local" status # print path to cardano-node binaries echo "pool1 node binary:" - pool1_pid="$("$STATE_CLUSTER/supervisorctl" pid nodes:pool1)" + pool1_pid="$("$STATE_CLUSTER/supervisorctl_local" pid nodes:pool1)" readlink -m "/proc/$pool1_pid/exe" echo "pool3 node binary:" - pool3_pid="$("$STATE_CLUSTER/supervisorctl" pid nodes:pool3)" + pool3_pid="$("$STATE_CLUSTER/supervisorctl_local" pid nodes:pool3)" readlink -m "/proc/$pool3_pid/exe" # check that nodes are running @@ -313,16 +313,16 @@ elif [ "$1" = "step3" ]; then cp -f "$STATE_CLUSTER/cardano-node-pool3.orig" "$STATE_CLUSTER/cardano-node-pool3" # restart all nodes - "$STATE_CLUSTER/supervisorctl" restart nodes: + "$STATE_CLUSTER/supervisorctl_local" restart nodes: sleep 10 - "$STATE_CLUSTER/supervisorctl" status + "$STATE_CLUSTER/supervisorctl_local" status # print path to cardano-node binaries echo "pool1 node binary:" - pool1_pid="$("$STATE_CLUSTER/supervisorctl" pid nodes:pool1)" + pool1_pid="$("$STATE_CLUSTER/supervisorctl_local" pid nodes:pool1)" readlink -m "/proc/$pool1_pid/exe" echo "pool3 node binary:" - pool3_pid="$("$STATE_CLUSTER/supervisorctl" pid nodes:pool3)" + pool3_pid="$("$STATE_CLUSTER/supervisorctl_local" pid nodes:pool3)" readlink -m "/proc/$pool3_pid/exe" # check that nodes are running diff --git a/cardano_node_tests/cluster_scripts/testnets/start-cluster b/cardano_node_tests/cluster_scripts/testnets/start-cluster index f1e7fa18e..c5ec5282c 100644 --- a/cardano_node_tests/cluster_scripts/testnets/start-cluster +++ b/cardano_node_tests/cluster_scripts/testnets/start-cluster @@ -136,7 +136,7 @@ fi # create scripts for cluster starting / stopping printf "#!/bin/sh\n\nsupervisorctl -s unix:///%s start all" "$SUPERVISORD_SOCKET_PATH" > "${STATE_CLUSTER}/supervisorctl_start" -printf "#!/bin/sh\n\nsupervisorctl -s unix:///%s \"\$@\"" "$SUPERVISORD_SOCKET_PATH" > "${STATE_CLUSTER}/supervisorctl" +printf "#!/bin/sh\n\nsupervisorctl -s unix:///%s \"\$@\"" "$SUPERVISORD_SOCKET_PATH" > "${STATE_CLUSTER}/supervisorctl_local" cat > "$STATE_CLUSTER/supervisord_start" <=2.15.2,<3.0.0)", "cardano-clusterlib (>=0.10.0,<0.11.0)", - "cardonnay (>=0.3.0,<0.4.0)", + "cardonnay (>=0.3.1,<0.4.0)", "cbor2 (>=5.7.1,<6.0.0)", "filelock (>=3.20.0,<4.0.0)", "hypothesis (>=6.148.7,<7.0.0)", diff --git a/scripts/restart_dev_cluster.sh b/scripts/restart_dev_cluster.sh index c32ea2115..8c3958685 100755 --- a/scripts/restart_dev_cluster.sh +++ b/scripts/restart_dev_cluster.sh @@ -30,9 +30,9 @@ sleep 2 "$STATE_CLUSTER/supervisord_start" sleep 2 -"$STATE_CLUSTER/supervisorctl" start all +"$STATE_CLUSTER/supervisorctl_local" start all sleep 1 echo echo "Dev cluster restarted; current status:" -"$STATE_CLUSTER/supervisorctl" status all +"$STATE_CLUSTER/supervisorctl_local" status all diff --git a/uv.lock b/uv.lock index e15cb1846..fefc52100 100644 --- a/uv.lock +++ b/uv.lock @@ -136,7 +136,7 @@ docs = [ requires-dist = [ { name = "allure-pytest", specifier = ">=2.15.2,<3.0.0" }, { name = "cardano-clusterlib", specifier = ">=0.10.0,<0.11.0" }, - { name = "cardonnay", specifier = ">=0.3.0,<0.4.0" }, + { name = "cardonnay", specifier = ">=0.3.1,<0.4.0" }, { name = "cbor2", specifier = ">=5.7.1,<6.0.0" }, { name = "filelock", specifier = ">=3.20.0,<4.0.0" }, { name = "hypothesis", specifier = ">=6.148.7,<7.0.0" }, @@ -175,7 +175,7 @@ docs = [ [[package]] name = "cardonnay" -version = "0.3.0" +version = "0.3.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "click" }, @@ -185,9 +185,9 @@ dependencies = [ { name = "setuptools" }, { name = "supervisor" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/79/13/43b7fac51d4eb6c3eb67d6731754272d961b001f7bc43f125dca8dbad664/cardonnay-0.3.0.tar.gz", hash = "sha256:a90a11c846c89b7e7008cb38833b4f09a83963a62b1472dcdff2dee839fa741c", size = 71741, upload-time = "2026-02-26T16:07:50.583Z" } +sdist = { url = "https://files.pythonhosted.org/packages/31/bf/83a048bffbee74454f13c814339a282a55441f36aa5a674e42893ef11fba/cardonnay-0.3.1.tar.gz", hash = "sha256:be483120aaa664785cfd588c4b6fc837fb5080bdb705530c9b596b78c0d6b1d2", size = 71760, upload-time = "2026-02-27T11:13:59.089Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/0a/ab/fd0ebf706a0c41320156c55998edcd9181025743cbd36a492c6818c11f6d/cardonnay-0.3.0-py3-none-any.whl", hash = "sha256:b68cc848c4505256403811f6d90ad2e686ed92cfd30d90579f503587f88a2d0e", size = 76269, upload-time = "2026-02-26T16:07:48.918Z" }, + { url = "https://files.pythonhosted.org/packages/50/b8/f6bc023ce89013a7f86125458c40d383cef7ecd680a5ed5171c26cf74862/cardonnay-0.3.1-py3-none-any.whl", hash = "sha256:896d0eaae25cd0e3aececbcd9f48191950e63508d57b7ab0f576ee0033f77ba1", size = 76273, upload-time = "2026-02-27T11:13:57.632Z" }, ] [[package]]