From 7ebedeb8efddacc27015b1968649eb85bebfe148 Mon Sep 17 00:00:00 2001
From: Rick Carback <rick@privategrity.com>
Date: Wed, 10 Jun 2020 16:10:38 +0000
Subject: [PATCH] Remove UDB sleep and wait until udb is ready directly, and
also use new node id's each time
---
basice2e/run.sh | 8 +++++++-
basice2e/server-1.yaml | 2 +-
basice2e/server-2.yaml | 2 +-
basice2e/server-3.yaml | 2 +-
basice2e/server-4.yaml | 2 +-
basice2e/server-5.yaml | 2 +-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/basice2e/run.sh b/basice2e/run.sh
index a3d4b23..561e62d 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -101,7 +101,13 @@ PIDVAL=$!
echo $PIDVAL >> results/serverpids
echo "$UDBCMD -- $PIDVAL"
-sleep 5
+rm rid.txt || true
+while [ ! -s rid.txt ] && [ $cnt -lt 30 ]; do
+ sleep 1
+ grep -a "Gateway Polling for Message Reception Begun" results/udb-console.txt > rid.txt || true
+ cnt=$(($cnt + 1))
+ echo -n "."
+done
runclients() {
echo "Starting clients..."
diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml
index b4cb047..07407e3 100644
--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -9,7 +9,7 @@ registrationCode: "qpol"
useGPU: false
node:
paths:
- idf: "nodeID-1.json"
+ idf: "results/servers/nodeID-1.json"
cert: "../keys/cmix.rip.crt"
key: "../keys/cmix.rip.key"
log: "results/servers/server-1.log"
diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml
index 84a959a..83ee21b 100644
--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -9,7 +9,7 @@ registrationCode: "yiiq"
useGPU: false
node:
paths:
- idf: "nodeID-2.json"
+ idf: "results/servers/nodeID-2.json"
cert: "../keys/cmix.rip.crt"
key: "../keys/cmix.rip.key"
log: "results/servers/server-2.log"
diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml
index 0fbd446..1f8c2b3 100644
--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -9,7 +9,7 @@ registrationCode: "vydz"
useGPU: false
node:
paths:
- idf: "nodeID-3.json"
+ idf: "results/servers/nodeID-3.json"
cert: "../keys/cmix.rip.crt"
key: "../keys/cmix.rip.key"
log: "results/servers/server-3.log"
diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml
index 36cf77f..9e280dd 100644
--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -9,7 +9,7 @@ registrationCode: "gwxs"
useGPU: false
node:
paths:
- idf: "nodeID-4.json"
+ idf: "results/servers/nodeID-4.json"
cert: "../keys/cmix.rip.crt"
key: "../keys/cmix.rip.key"
log: "results/servers/server-4.log"
diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml
index 571f670..f8a2a6e 100644
--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -9,7 +9,7 @@ registrationCode: "nahv"
useGPU: false
node:
paths:
- idf: "nodeID-5.json"
+ idf: "results/servers/nodeID-5.json"
cert: "../keys/cmix.rip.crt"
key: "../keys/cmix.rip.key"
log: "results/servers/server-5.log"
--
GitLab