From d4fa3baa38d2d61e934e1c45325b662f4fcaa4ed Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 22 May 2024 10:56:29 -0700 Subject: [PATCH] chore(ci): relax ping timeout for wireless node --- ci/hostname.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ci/hostname.sh b/ci/hostname.sh index b3303ab9..a0f7000a 100644 --- a/ci/hostname.sh +++ b/ci/hostname.sh @@ -2,6 +2,7 @@ set -eu DEPLOY_USER= +ARG_TIMEOUT=8 if [[ $# -gt 1 ]]; then ARG_NODE=$1 ARG_HOSTNAME=$2 @@ -14,7 +15,7 @@ else if DEPLOY_HOSTNAME=$(nix eval --raw "${NF_CONFIG_ROOT}#deploy.nodes.$ARG_HOSTNAME.hostname" 2>/dev/null); then DEPLOY_USER=$(nix eval --raw "${NF_CONFIG_ROOT}#deploy.nodes.$ARG_HOSTNAME.sshUser" 2>/dev/null || true) ARG_HOSTNAME=$DEPLOY_HOSTNAME - if ! ping -w2 -c1 "$DEPLOY_HOSTNAME" >/dev/null 2>&1; then + if ! ping -w${ARG_TIMEOUT} -c1 "$DEPLOY_HOSTNAME" >/dev/null 2>&1; then ARG_HOSTNAME="$ARG_NODE.local" fi else @@ -23,15 +24,19 @@ else fi fi -if ! ping -w2 -c1 "$ARG_HOSTNAME" >/dev/null 2>&1; then +if [[ $ARG_NODE != logistics ]]; then + ARG_TIMEOUT=2 +fi + +if ! ping -w${ARG_TIMEOUT} -c1 "$ARG_HOSTNAME" >/dev/null 2>&1; then LOCAL_HOSTNAME=$ARG_NODE.local.gensokyo.zone TAIL_HOSTNAME=$ARG_NODE.tail.gensokyo.zone GLOBAL_HOSTNAME=$ARG_NODE.gensokyo.zone - if ping -w2 -c1 "$LOCAL_HOSTNAME" >/dev/null 2>&1; then + if ping -w${ARG_TIMEOUT} -c1 "$LOCAL_HOSTNAME" >/dev/null 2>&1; then ARG_HOSTNAME=$LOCAL_HOSTNAME - elif ping -w2 -c1 "$TAIL_HOSTNAME" >/dev/null 2>&1; then + elif ping -w${ARG_TIMEOUT} -c1 "$TAIL_HOSTNAME" >/dev/null 2>&1; then ARG_HOSTNAME=$TAIL_HOSTNAME - elif ping -w2 -c1 "$GLOBAL_HOSTNAME" >/dev/null 2>&1; then + elif ping -w${ARG_TIMEOUT} -c1 "$GLOBAL_HOSTNAME" >/dev/null 2>&1; then ARG_HOSTNAME=$GLOBAL_HOSTNAME fi fi