Wait for NAOs during pre- and postgame (#1672)

* Wait for NAOs during pre- and postgame * Bump pepsi version --------- Co-authored-by: Julian Schuler <[email protected]>
HULKs · Mar 9, 2025 · 60ec10c · 60ec10c
1 parent 843285b
commit 60ec10c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/nao/src/lib.rs b/crates/nao/src/lib.rs
@@ -55,6 +55,14 @@ impl Nao {
         Self { address }
     }
 
+    pub async fn ping_until_available(host: Ipv4Addr) -> Self {
+        loop {
+            if let Ok(nao) = Self::try_new_with_ping(host).await {
+                return nao;
+            }
+        }
+    }
+
     pub async fn try_new_with_ping(host: Ipv4Addr) -> Result<Self> {
         Self::try_new_with_ping_and_arguments(host, PING_TIMEOUT).await
     }

diff --git a/tools/pepsi/Cargo.toml b/tools/pepsi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pepsi"
-version = "5.1.0"
+version = "5.2.0"
 edition.workspace = true
 license.workspace = true
 homepage.workspace = true

diff --git a/tools/pepsi/src/post_game.rs b/tools/pepsi/src/post_game.rs
@@ -60,7 +60,9 @@ pub async fn post_game(arguments: Arguments, repository: &Repository) -> Result<
         &naos,
         "Executing postgame tasks...",
         |nao_address, progress_bar| async move {
-            let nao = Nao::try_new_with_ping(nao_address.ip).await?;
+            progress_bar.set_message("Pinging NAO...");
+            let nao = Nao::ping_until_available(nao_address.ip).await;
+
             progress_bar.set_message("Stopping HULK service...");
             nao.execute_systemctl(SystemctlAction::Stop, "hulk")
                 .await

diff --git a/tools/pepsi/src/pre_game.rs b/tools/pepsi/src/pre_game.rs
@@ -151,7 +151,7 @@ async fn setup_nao(
     repository: &Repository,
 ) -> Result<()> {
     progress.set_message("Pinging NAO...");
-    let nao = Nao::try_new_with_ping(nao_address.ip).await?;
+    let nao = Nao::ping_until_available(nao_address.ip).await;
 
     if !arguments.skip_os_check {
         progress.set_message("Checking OS version...");