Merge pull request #818 from serokell/krendelhoff/#759-gracefully-han…

…dle-testnet-unavailability [#759] Handle testnet config unavailability
serokell · Aug 26, 2024 · 457d522 · 457d522
2 parents 86bdd6f + d913217
commit 457d522
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/docker/package/packages.py b/docker/package/packages.py
@@ -252,6 +252,9 @@ def mk_node_unit(
 node_units = []
 node_postinst_steps = postinst_steps_common
 node_additional_scripts = []
+node_postinst_steps += """
+curl -sSL https://teztnets.com/teztnets.json -o /var/lib/tezos/teztnets.json
+"""
 for network, network_config in networks.items():
     config_file_append = [
         f'TEZOS_NODE_DIR="/var/lib/tezos/node-{network}"',
@@ -273,9 +276,15 @@ def mk_node_unit(
         )
     )
     node_postinst_steps += f"""
-mkdir -p /var/lib/tezos/node-{network}
-[ ! -f /var/lib/tezos/node-{network}/config.json ] && octez-node config init --data-dir /var/lib/tezos/node-{network} --network {network_config}
-chown -R tezos:tezos /var/lib/tezos/node-{network}
+config="$(cat /var/lib/tezos/teztnets.json | jq .{network})"
+if [ "$config" != "null" ]; then
+    mkdir -p /var/lib/tezos/node-{network}
+    [ ! -f /var/lib/tezos/node-{network}/config.json ] && octez-node config init --data-dir /var/lib/tezos/node-{network} --network {network_config}
+    chown -R tezos:tezos /var/lib/tezos/node-{network}
+else
+    echo "Network {network} not found in teztnets.json"
+    echo "Skipping node setup for {network}..."
+fi
 """
 
 # Add custom config service
@@ -317,6 +326,7 @@ def mk_node_unit(
             additional_native_deps=[
                 "tezos-sapling-params",
                 "curl",
+                "jq",
                 {"ubuntu": "netbase"},
             ],
             additional_scripts=node_additional_scripts,

diff --git a/tests/systemd/Vagrantfile b/tests/systemd/Vagrantfile
@@ -25,7 +25,7 @@ Vagrant.configure("2") do |config|
   config.vm.box = "generic/ubuntu2004"
   config.vm.provision "shell", run: "once", inline: <<-SHELL
     add-apt-repository -y ppa:serokell/tezos && apt-get update
-    apt-get install -y tezos-sapling-params acl python3-pystemd python3-pytest python3-psutil
+    apt-get install -y tezos-sapling-params acl python3-pystemd python3-pytest python3-psutil jq
   SHELL
   config.vm.provision "file", run: "always", source: "#{packagesDirectory}", destination: "$HOME/out"
   config.vm.provision "file", run: "always", source: "services_tests.py", destination: "$HOME/services_tests.py"