Skip to content

Commit 108048b

Browse files
authored
Merge pull request #3091 from IntersectMBO/run_from_state_cluster
fix(cluster): use run scripts from status directory
2 parents 7abdaf1 + 5412111 commit 108048b

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

cardano_node_tests/cluster_scripts/testnets/start-cluster

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ if [ -e "$SCRIPT_DIR/testnet_conf" ]; then
4040
TESTNET_CONF_DIR="$SCRIPT_DIR/testnet_conf"
4141
fi
4242

43+
ENABLE_SUBMIT_API="$(command -v cardano-submit-api >/dev/null 2>&1 && \
44+
[ -e "$TESTNET_CONF_DIR/submit-api-config.json" ] && \
45+
echo 1 || echo 0)"
46+
4347
# copy faucet address and keys
4448
cp "$TESTNET_DIR"/shelley/faucet.* "$STATE_CLUSTER/shelley"
4549
[ -e "$STATE_CLUSTER/shelley/faucet.addr" ] || \
@@ -51,7 +55,6 @@ cp "$TESTNET_DIR"/shelley/faucet.* "$STATE_CLUSTER/shelley"
5155

5256
# copy configuration files
5357
cp "$SCRIPT_DIR"/cardano-node-* "$STATE_CLUSTER"
54-
cp "$SCRIPT_DIR/run-cardano-submit-api" "$STATE_CLUSTER"
5558
cp "$SCRIPT_DIR/supervisor.conf" "$STATE_CLUSTER"
5659
cp "$SCRIPT_DIR/testnet.json" "$STATE_CLUSTER"
5760
cp "$TESTNET_CONF_DIR/topology-relay1.json" "$STATE_CLUSTER"
@@ -86,15 +89,16 @@ if [ -n "${DBSYNC_SCHEMA_DIR:-""}" ]; then
8689
{ echo "The \`cardano-db-sync\` binary not found, line $LINENO" >&2; exit 1; } # assert
8790

8891
# copy db-sync config file
89-
cp "$TESTNET_CONF_DIR/dbsync-config.yaml" "$STATE_CLUSTER/dbsync-config.yaml"
90-
92+
cp "$TESTNET_CONF_DIR/dbsync-config.yaml" "$STATE_CLUSTER"
9193
# copy db-sync state
9294
cp -r "$TESTNET_DIR/db-sync" "$STATE_CLUSTER/db-sync"
95+
# copy run script
96+
cp "$SCRIPT_DIR/run-cardano-dbsync" "$STATE_CLUSTER"
9397

9498
cat >> "$STATE_CLUSTER/supervisor.conf" <<EoF
9599
96100
[program:dbsync]
97-
command=$SCRIPT_DIR/run-cardano-dbsync
101+
command=./$STATE_CLUSTER_NAME/run-cardano-dbsync
98102
stderr_logfile=./$STATE_CLUSTER_NAME/dbsync.stderr
99103
stdout_logfile=./$STATE_CLUSTER_NAME/dbsync.stdout
100104
autostart=false
@@ -104,14 +108,16 @@ EoF
104108
fi
105109

106110
# enable cardano-submit-api service
107-
if command -v cardano-submit-api >/dev/null 2>&1 && [ -e "$TESTNET_CONF_DIR/submit-api-config.json" ]; then
111+
if [ "$ENABLE_SUBMIT_API" -eq 1 ]; then
112+
# copy run script
113+
cp "$SCRIPT_DIR/run-cardano-submit-api" "$STATE_CLUSTER"
108114
# copy cardano-submit-api config file
109-
cp "$TESTNET_CONF_DIR/submit-api-config.json" "$STATE_CLUSTER/submit-api-config.json"
115+
cp "$TESTNET_CONF_DIR/submit-api-config.json" "$STATE_CLUSTER"
110116

111117
cat >> "$STATE_CLUSTER/supervisor.conf" <<EoF
112118
113119
[program:submit_api]
114-
command=$SCRIPT_DIR/run-cardano-submit-api
120+
command=./$STATE_CLUSTER_NAME/run-cardano-submit-api
115121
stderr_logfile=./$STATE_CLUSTER_NAME/submit_api.stderr
116122
stdout_logfile=./$STATE_CLUSTER_NAME/submit_api.stdout
117123
autostart=false
@@ -202,7 +208,7 @@ done
202208
[ "$sync_progress" = "100.00" ] || { echo "Failed to sync the realy node, line $LINENO" >&2; exit 1; } # assert
203209

204210
# start cardano-submit-api
205-
if command -v cardano-submit-api >/dev/null 2>&1 && [ -e "$STATE_CLUSTER/submit-api-config.json" ]; then
211+
if [ "$ENABLE_SUBMIT_API" -eq 1 ]; then
206212
echo "Starting cardano-submit-api"
207213
supervisorctl -s "unix:///${SUPERVISORD_SOCKET_PATH}" start submit_api
208214
fi

0 commit comments

Comments
 (0)