From 5e69dd728519a59ab24013700d000c885bb7c49b Mon Sep 17 00:00:00 2001 From: Franco Testagrossa Date: Wed, 28 Aug 2024 17:43:12 +0200 Subject: [PATCH] Remove unnecessary scripts --- .github/workflows/network-test.yaml | 7 +-- .github/workflows/network/peers_info_json.sh | 60 -------------------- .github/workflows/network/run_pumba.sh | 18 +----- 3 files changed, 6 insertions(+), 79 deletions(-) delete mode 100755 .github/workflows/network/peers_info_json.sh diff --git a/.github/workflows/network-test.yaml b/.github/workflows/network-test.yaml index 567c2dd7082..5c45204b501 100644 --- a/.github/workflows/network-test.yaml +++ b/.github/workflows/network-test.yaml @@ -89,11 +89,10 @@ jobs: # Extract inputs with defaults for non-workflow_dispatch events percent="${{ matrix.netem_loss }}" scaling_factor="${{ matrix.scaling_factor }}" - target_peer="alice" + target_peer="hydra-node-1" + other_peers="172.16.238.20 172.16.238.30" - peers_info_json=$(.github/workflows/network/peers_info_json.sh) - - .github/workflows/network/run_pumba.sh $target_peer $percent $peers_info_json + .github/workflows/network/run_pumba.sh $target_peer $percent $other_peers # Run benchmark on demo mkdir benchmarks diff --git a/.github/workflows/network/peers_info_json.sh b/.github/workflows/network/peers_info_json.sh deleted file mode 100755 index 8e1936242eb..00000000000 --- a/.github/workflows/network/peers_info_json.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env bash - -if ! command -v jq &> /dev/null -then - echo "jq is required for this script ~ install it." - exit 1 -fi - -extract_hydra_node_info_json() { - local node_name=$1 - - local container_name="demo-$node_name-1" - - local network=$(docker inspect "$container_name" | jq '.[0].NetworkSettings.Networks.demo_hydra_net.IPAMConfig.IPv4Address' | tr -d '"') - - local command_list=$(docker inspect "$container_name" | jq '.[0].Config.Cmd') - - local json=$( - echo "$command_list" | jq -r ' - . as $arr | - reduce range(0; ($arr | length) / 2) as $i ( - {}; - . + {($arr[2 * $i]): $arr[2 * $i + 1]} - ) - | with_entries( - select( - .key == "--node-id" or - .key == "--api-host" or - .key == "--host" or - .key == "--hydra-signing-key" or - .key == "--cardano-signing-key" or - .key == "--ledger-protocol-parameters" or - .key == "--testnet-magic" or - .key == "--persistence-dir" - ) - ) - | with_entries( - .key |= sub("^--"; "") | # Remove -- - .key |= gsub("-"; "_") # Replace - with _ - )' - ) - echo "{\"node_name\": \"$node_name\", \"info\": $json, \"network\": \"$network\" }" -} - -peers_info_json() { - echo "{ - \"alice\": $(extract_hydra_node_info_json "hydra-node-1"), - \"bob\": $(extract_hydra_node_info_json "hydra-node-2"), - \"carol\": $(extract_hydra_node_info_json "hydra-node-3") - }" -} - -json_result=$(echo $(peers_info_json) | jq -c) - -if [[ -z "$json_result" ]]; then - echo "Error: json_result is empty." - exit 1 -fi - -echo $json_result diff --git a/.github/workflows/network/run_pumba.sh b/.github/workflows/network/run_pumba.sh index 94fc2f85504..d881f5e2ecf 100755 --- a/.github/workflows/network/run_pumba.sh +++ b/.github/workflows/network/run_pumba.sh @@ -1,29 +1,17 @@ #!/usr/bin/env bash -if ! command -v jq &> /dev/null -then - echo "jq is required for this script ~ install it." - exit 1 -fi - -target_peer=$1 +target_node_name=$1 percent=$2 -peers_info_json=$3 - -target_node_name=$(echo "$peers_info_json" | jq -r ".$target_peer.node_name") +rest_node_names=$3 # Build Pumba netem command -unselected_networks=$(echo "$peers_info_json" | jq -r --arg selected_peer "$target_peer" ' - to_entries[] | select(.key != $selected_peer) | .value.network -') - nix_command="nix run github:noonio/pumba/noon/add-flake -- -l debug --random netem --duration 20m" while IFS= read -r network; do nix_command+=" --target $network" -done <<< "$unselected_networks" +done <<< "$rest_node_names" nix_command+=" loss --percent \"$percent\" \"re2:$target_node_name\" &"