Merge branch 'release' into 'master'

Release

See merge request !4

smokeinfra/permissioning.yaml

@@ -21,16 +21,22 @@ dbAddress: "0.0.0.0:6969"
 
 minimumNodes: 3
 
-minGatewayVersion: "2.0.0"
-minServerVersion:  "2.0.0"
+minGatewayVersion: "3.0.0"
+minServerVersion:  "3.0.0"
 minClientVersion: "2.0.0"
 nodeMetricInterval: 3
 
-disableGatewayPing: true
+
+# For testing, use the sequence as the country code. Do not use the geobinning database
+disableGeoBinning: true
+
+# For testing, do not exclude node or gateway IPs which are local to the machine
+allowLocalIPs: true
 
 # Disable pruning of NDF for offline nodes
 # if set to false, network will sleep for five minutes on start
 disableNDFPruning: true
+permissiveIPChecking: true
 
 clientRegCodes:
   - "FFFF"
@@ -90,3 +96,4 @@ schedulingConfigPath: "registration.json"
 # Path to JSON file with list of Node registration codes (in order of network
 # placement)
 RegCodesFilePath: "regCodes.json"
+

smokeinfra/regCodes.json

-[{"RegCode": "qpol", "Order": "0"},{"RegCode": "yiiq", "Order": "1"},{"RegCode": "vydz", "Order": "2"},{"RegCode": "gwxs", "Order": "3"},{"RegCode": "nahv", "Order": "4"}, {"RegCode": "doko", "Order": "5"}]
+[{"RegCode": "qpol", "Order": "CR"},{"RegCode": "yiiq", "Order": "GB"},{"RegCode": "vydz", "Order": "SK"},{"RegCode": "gwxs", "Order": "HR"},{"RegCode": "nahv", "Order": "IQ"}, {"RegCode": "doko", "Order": "RU"}]

smokeinfra/registration.json

 {
   "TeamSize": 3,
   "BatchSize": 32,
-  "RandomOrdering": false,
   "MinimumDelay": 60,
   "RealtimeDelay": 120,
+  "SemiOptimalOrdering": true,
   "Threshold":     3,
   "NodeCleanUpInterval": 3,
-  "ResourceQueueTimeout": 300000,
-  "Secure": 		     false
+  "ResourceQueueTimeout": 300000
+
 
  }

smokeinfra/run.sh

@@ -18,7 +18,7 @@ PIDVAL=$!
 echo "$PERMCMD -- $PIDVAL"
 
 echo "STARTING SERVERS..."
-
+PID_SERVER_KILLED=$!
 for SERVERID in $(seq 3 -1 1)
 do
     IDX=$(($SERVERID - 1))
@@ -26,6 +26,9 @@ do
     $SERVERCMD > $SERVERLOGS/server-$SERVERID.console 2>&1 &
     PIDVAL=$!
     echo "$SERVERCMD -- $PIDVAL"
+    if [ $SERVERID -eq 1 ]; then
+      PID_SERVER_KILLED=$PIDVAL
+    fi
     if [ $SERVERID -eq 2 ]; then
         sleep 10 # This will force a CDE timeout
     fi
@@ -82,6 +85,9 @@ diff -ruN results/gateway-errors.txt noerrors.txt
 
 echo "NO OUTPUT ERRORS"
 
+
+
+
 echo "CHECKING THAT AT LEAST 2 ROUNDS RAN"
 cat results/server-3.log | grep "RID 1 ReceiveFinishRealtime END" > rid.txt || true
 if [ ! -s rid.txt ]; then
@@ -89,5 +95,21 @@ if [ ! -s rid.txt ]; then
     exit 42
 fi
 
+# Kill the last server
+echo "KILLING SERVER 0 EARLY"
+kill -15 $PID_SERVER_KILLED
+# Wait for node to handle kill signal
+sleep 30
+
+
+echo "CHECKING THAT SERVER 0 WAS KILLED PROPERLY"
+cat results/server-1.log | grep "Round completed, closing!" > serverClose.txt || true
+if [ -s serverClose.txt  ]; then
+    echo "SERVER 0 CLOSED SUCCESSFULLY"
+else
+    echo "SERVER 0 WAS NOT CLOSED PROPERLY"
+    exit 42
+fi
+
 tail $SERVERLOGS/*.console
 echo "SUCCESS!"

smokeinfra/server-1.yaml

@@ -8,7 +8,8 @@
 registrationCode: "qpol"
 useGPU: false
 devMode: true
-node:
+rawPermAddr: true
+cmix:
     paths:
         idf:  "nodeID-1.json"
         cert: "../keys/cmix.rip.crt"
@@ -26,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-permissioning:
+scheduling:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"

smokeinfra/server-2.yaml

@@ -8,7 +8,8 @@
 registrationCode: "yiiq"
 useGPU: false
 devMode: true
-node:
+rawPermAddr: true
+cmix:
     paths:
         idf:  "nodeID-2.json"
         cert: "../keys/cmix.rip.crt"
@@ -26,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-permissioning:
+scheduling:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"

smokeinfra/server-3.yaml

@@ -8,7 +8,8 @@
 registrationCode: "vydz"
 useGPU: false
 devMode: true
-node:
+rawPermAddr: true
+cmix:
     paths:
         idf:  "nodeID-3.json"
         cert: "../keys/cmix.rip.crt"
@@ -26,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-permissioning:
+scheduling:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"

smokeinfra/serverClose.txt

+INFO 2021/08/11 14:52:34 Round completed, closing!