From 94a91ab024caeb084a3a75874ee85073126f79df Mon Sep 17 00:00:00 2001
From: Dominik Roos <roos@anapaya.net>
Date: Mon, 16 Sep 2024 09:52:55 +0200
Subject: [PATCH] revert changes from #4605

---
 .buildkite/pipeline.yml  | 6 +++---
 tools/await-connectivity | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 66807f0b33..a00e9f7ae5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -117,7 +117,7 @@ steps:
         - ./scion.sh run
         - tools/await-connectivity
         - ./bin/scion_integration || ( echo "^^^ +++" && false )
-        - ./bin/end2end_integration --attempts=3 || ( echo "^^^ +++" && false )
+        - ./bin/end2end_integration || ( echo "^^^ +++" && false )
       plugins: &scion-run-hooks
         - scionproto/metahook#v0.3.0:
             pre-command: .buildkite/cleanup-leftovers.sh
@@ -144,7 +144,7 @@ steps:
         - ./scion.sh topology -c topology/default-no-peers.topo
         - ./scion.sh run
         - tools/await-connectivity
-        - ./bin/end2end_integration --attempts=3 || ( echo "^^^ +++" && false )
+        - ./bin/end2end_integration || ( echo "^^^ +++" && false )
         - ./tools/integration/revocation_test.sh
       plugins: *scion-run-hooks
       artifact_paths: *scion-run-artifact-paths
@@ -161,7 +161,7 @@ steps:
         - ./scion.sh run
         - tools/await-connectivity
         - echo "--- run tests"
-        - ./bin/end2end_integration -d --attempts=3 || ( echo "^^^ +++" && false )
+        - ./bin/end2end_integration -d || ( echo "^^^ +++" && false )
       plugins: *scion-run-hooks
       artifact_paths: *scion-run-artifact-paths
       timeout_in_minutes: 15
diff --git a/tools/await-connectivity b/tools/await-connectivity
index e0876f1509..9438ffeaf2 100755
--- a/tools/await-connectivity
+++ b/tools/await-connectivity
@@ -88,12 +88,12 @@ main() {
   local noncores=$(sed -n '/Non-core/,${s/^- //p}' gen/as_list.yml)
 
   for i in $(seq 1 "$QUIET"); do
-    check_connectivity "$cores" "$noncores" > /dev/null && return 0
+    check_connectivity "$cores" "$noncores" > /dev/null && exit 0
     sleep 1
   done
   for i in $(seq "$QUIET" $((TIMEOUT-1))); do
     echo "Check after ${i}s"
-    check_connectivity "$cores" "$noncores" && return 0
+    check_connectivity "$cores" "$noncores" && exit 0
     sleep 1
   done
   echo "Check after ${TIMEOUT}s"
@@ -101,6 +101,3 @@ main() {
 }
 
 main "$@"
-
-# that is not enough. Down segment registrations don't seem to happen fast.
-sleep 10