Increase timeout length

aab32bc0 · Josh Brooks · 1418fba3 · 2936626a · aab32bc0 · aab32bc0
Commit aab32bc0 authored May 7, 2020 by Josh Brooks
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,10 +17,12 @@ cache:
 variables:
  REPO_DIR: gitlab.com/elixxir
  REPO_NAME: server
-  DOCKER_IMAGE: bmastc/golang-glide:latest
+  DOCKER_IMAGE: sydney112/cuda-go:latest
  # See https://docs.gitlab.com/ee/api/jobs.html#download-a-single-artifact-file-from-specific-tag-or-branch
  REPOS_API: https://gitlab.com/api/v4/projects/elixxir%2F
  SERVER_URL: ${REPOS_API}server/jobs/artifacts/$SERVER_ID/raw/release/server.linux64?job=build
+  SERVER_GPU_URL: ${REPOS_API}server/jobs/artifacts/$SERVER_ID/raw/release/server-cuda.linux64?job=build
+  GPULIB_URL: ${REPOS_API}server/jobs/artifacts/$SERVER_ID/raw/gpumaths/cgbnBindings/powm/libpowmosm75.so?job=build
  CLIENT_URL: ${REPOS_API}client/jobs/artifacts/$CLIENT_ID/raw/release/client.linux64?job=build
  REGISTRATION_URL: ${REPOS_API}registration/jobs/artifacts/$REGISTRATION_ID/raw/release/registration.linux64?job=build
  UDB_URL: ${REPOS_API}user-discovery-bot/jobs/artifacts/$UDB_ID/raw/release/udb.linux64?job=build
@@ -52,7 +54,7 @@ installbinaries:
    - mkdir -p ~/.elixxir
    - mkdir -p bin
    - cd bin
-    - "DOWNLOADS=\"$SERVER_URL $CLIENT_URL $REGISTRATION_URL $UDB_URL $GATEWAY_URL\""
+    - "DOWNLOADS=\"$SERVER_URL $CLIENT_URL $REGISTRATION_URL $UDB_URL $GATEWAY_URL $SERVER_GPU_URL $GPULIB_URL\""
    - >
      if [ "$CI_BUILD_REF_NAME" == "master" ]; then
        DOWNLOADS=$(echo $DOWNLOADS | sed "s/artifacts\/$DEFAULTBRANCH\/raw/artifacts\/master\/raw/g")
@@ -64,13 +66,18 @@ installbinaries:
      done
    - ls -lha
    - mv server.linux64?job=build server
+    - mv server-cuda.linux64?job=build server-cuda
    - mv client.linux64?job=build client
    - mv udb.linux64?job=build udb
    - mv registration.linux64?job=build permissioning
    - mv gateway.linux64?job=build gateway
+    - mv libpowmosm75.so?job=build libpowmosm75.so
+    - mkdir -p /opt/elixxir/lib
+    - cp libpowmosm75.so /opt/elixxir/lib/
    - "chmod +x *"
    - cd ..
    - bin/server version
+    - bin/server-cuda version
    - bin/client --version || bin/client version
    - bin/udb --version || bin/udb version
    - bin/gateway --version || bin/gateway version
@@ -82,43 +89,33 @@ installbinaries:

 basice2e:
  stage: tests
+  tags:
+    - gpu
  image: $DOCKER_IMAGE
  script:
    - mkdir -p ~/.elixxir
    - echo $PWD
    - cd basice2e
+    - rm -fr results
+    - rm -fr results-cpu
+    - rm -fr results-gpu
+    - ls -lha
+    - ./run.sh
+    - mv results results-cpu
+    - mkdir -p /opt/elixxir/lib
+    - cp ../bin/libpowmosm75.so /opt/elixxir/lib/
+    - sed -i 's/bin\/server/bin\/server-cuda/g' run.sh
+    - sed -i 's/useGpu\:\ false/useGpu\:\ true/g' server-[12345].yaml
    - ./run.sh
+    - mv results results-gpu
    - cd ..
  artifacts:
    when: always
    expire_in: '1 day'
    paths:
-     - basice2e/results/
+     - basice2e/
     - bin/

-
-# NOTE: This was removed because of port conflicts with the base test. Instead
-# we run in TLS mode by default and disable this version
-# basice2eTLS:
-#   stage: tests
-#   image: $DOCKER_IMAGE
-#   script:
-#     - mkdir -p ~/.elixxir
-#     - echo $PWD
-#     - cd basice2e
-#     - for CONFIG in $(echo *.yaml); do echo $CONFIG; sed -i 's/cert\:\ \"\"/cert\:\ \"\.\.\/keys\/cmix\.rip\.crt\"/g'  $CONFIG; sed -i 's/key\:\ \ \"\"/key\:\ \ \"\.\.\/keys\/cmix\.rip\.key\"/g'  $CONFIG; done
-#     - for CONFIG in $(echo *.yaml); do echo $CONFIG; sed -i 's/ertPath\:\ \"\"/ertPath\:\ \"\.\.\/keys\/cmix\.rip\.crt\"/g'  $CONFIG; sed -i 's/keyPath\:\ \"\"/keyPath\:\ \"\.\.\/keys\/cmix\.rip\.key\"/g'  $CONFIG; done
-#     - sed -i "s/\"Tls\_certificate\"\:\ \"\"/\"Tls\_certificate\"\:\ \"$(awk -v ORS='\\n' '1' ../keys/cmix.rip.crt | sed -e 's/[\/&]/\\&/g')\"/g" ndf.json
-#     - sed -i 's/\-\-noTLS//g' run.sh
-#     - ./run.sh
-#     - cd ..
-#   artifacts:
-#     when: always
-#     expire_in: '1 day'
-#     paths:
-#      - basice2e/
-#      - bin/
-
 smokeinfra:
  stage: tests
  image: $DOCKER_IMAGE

--- a/basice2e/ndf.json
+++ b/basice2e/ndf.json
--- a/basice2e/rid.txt
+++ b/basice2e/rid.txt
-INFO 2020/05/01 07:53:48 [IgRM82Dm1VV3joyz34iZWD2VYjAZZsyVaqK7ryqQ1kg=:50004]: RID 0 ReceiveFinishRealtime END
+INFO 2020/05/06 15:36:22 [IgRM82Dm1VV3joyz34iZWD2VYjAZZsyVaqK7ryqQ1kg=:50004]: RID 0 ReceiveFinishRealtime END
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -9,8 +9,8 @@ rm blob* || true

 mkdir -p .elixxir

-export GRPC_GO_LOG_VERBOSITY_LEVEL=99
-export GRPC_GO_LOG_SEVERITY_LEVEL=info
+#export GRPC_GO_LOG_VERBOSITY_LEVEL=99
+#export GRPC_GO_LOG_SEVERITY_LEVEL=info

 SERVERLOGS=results/servers
 GATEWAYLOGS=results/gateways
@@ -28,7 +28,7 @@ mkdir -p $CLIENTCLEAN

 # Start a user discovery bot server
 echo "STARTING UDB..."
-UDBCMD="../bin/udb --config udb.yaml -l 1"
+UDBCMD="../bin/udb --logLevel 3 --config udb.yaml -l 1"
 $UDBCMD >> $UDBOUT 2>&1 &
 PIDVAL=$!
 echo $PIDVAL >> results/serverpids
@@ -36,12 +36,8 @@ echo "$UDBCMD -- $PIDVAL"

 echo "STARTING SERVERS..."

-export GRPC_GO_LOG_VERBOSITY_LEVEL=99 
-export GRPC_GO_LOG_SEVERITY_LEVEL=info
-rm -f ../keys/cmix.rip.crt-definitio
-
 PERMCMD="../bin/permissioning -c permissioning.yaml "
-$PERMCMD > $SERVERLOGS/permissioning.log 2>&1 &
+$PERMCMD > $SERVERLOGS/permissioning-console.txt 2>&1 &
 PIDVAL=$!
 echo "$PERMCMD -- $PIDVAL"

@@ -111,7 +107,7 @@ runclients() {
            nid=$(((($cid + 1) % 4) + 4))
            eval NICK=\${NICK${cid}}
            # Send a regular message
-            CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -f blob$cid -E email$cid@email.com -i $cid -d $nid -m \"Hello, $nid\""
+            CLIENTCMD="timeout 60s ../bin/client $CLIENTOPTS -f blob$cid -E email$cid@email.com -i $cid -d $nid -m \"Hello, $nid\""
            eval $CLIENTCMD >> $CLIENTOUT/client$cid$nid.txt 2>&1 &
            PIDVAL=$!
            eval CLIENTS${CTR}=$PIDVAL
@@ -135,17 +131,17 @@ runclients

 # Register two users and then do UDB search on each other
 echo "REGISTERING AND SEARCHING WITH PRECANNED USERS..."
-CLIENTCMD="timeout 30s ../bin/client  $CLIENTOPTS -l $CLIENTOUT/client9.log -f blob9 -E niamh@elixxir.io -i 9 -d 9 -m \"Hi\""
+CLIENTCMD="timeout 90s ../bin/client  $CLIENTOPTS -l $CLIENTOUT/client9.log -f blob9 -E niamh@elixxir.io -i 9 -d 9 -m \"Hi\""
 eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL
-CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client18.log -f blob18 -E bernardo@elixxir.io -i 18 -d 9 -s \"niamh@elixxir.io\" --keyParams 3,4,2,1.0,2"
+CLIENTCMD="timeout 90s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client18.log -f blob18 -E bernardo@elixxir.io -i 18 -d 9 -s \"niamh@elixxir.io\" --keyParams 3,4,2,1.0,2"
 eval $CLIENTCMD >> $CLIENTOUT/client18.txt 2>&1 &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL
-CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log -f blob9 -i 9 -d 18 -s \"bernardo@elixxir.io\" --keyParams 3,4,2,1.0,2"
+CLIENTCMD="timeout 90s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log -f blob9 -i 9 -d 18 -s \"bernardo@elixxir.io\" --keyParams 3,4,2,1.0,2"
 eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
@@ -167,11 +163,11 @@ wait $PIDVAL || true

 # Register non-precanned users
 echo "REGISTERING NEW USERS..."
-CLIENTCMD="timeout 30s ../bin/client  $CLIENTOPTS -l $CLIENTOUT/client42.log -f blob42 -E rick42@elixxir.io -r FFFF"
+CLIENTCMD="timeout 60s ../bin/client  $CLIENTOPTS -l $CLIENTOUT/client42.log -f blob42 -E rick42@elixxir.io -r FFFF"
 eval $CLIENTCMD >> $CLIENTOUT/client42.txt &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
-CLIENTCMD="timeout 30s ../bin/client  $CLIENTOPTS -l $CLIENTOUT/client43.log -f blob43 -E ben43@elixxir.io -r GGGG"
+CLIENTCMD="timeout 60s ../bin/client  $CLIENTOPTS -l $CLIENTOUT/client43.log -f blob43 -E ben43@elixxir.io -r GGGG"
 eval $CLIENTCMD >> $CLIENTOUT/client43.txt &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"
@@ -180,11 +176,11 @@ wait $PIDVAL2

 # Have each non-precanned user search for each other
 echo "SEARCHING FOR NEW USERS..."
-CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -f blob42 -s \"ben43@elixxir.io\" --keyParams 3,4,2,1.0,2"
+CLIENTCMD="timeout 60s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -f blob42 -s \"ben43@elixxir.io\" --keyParams 3,4,2,1.0,2"
 eval $CLIENTCMD >> $CLIENTOUT/client42.txt &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
-CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -f blob43 -s \"rick42@elixxir.io\" --keyParams 3,4,2,1.0,2"
+CLIENTCMD="timeout 60s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -f blob43 -s \"rick42@elixxir.io\" --keyParams 3,4,2,1.0,2"
 eval $CLIENTCMD >> $CLIENTOUT/client43.txt &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"
@@ -200,11 +196,11 @@ BENID=${TMPID%?} # remove ! from end

 # Non-precanned user messaging
 echo "SENDING E2E MESSAGES TO NEW USERS..."
-CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -c 1 -w 1 --dest64 $BENID -s \"ben43@elixxir.io\" -f blob42 -m \"Hello from Rick42, with E2E Encryption\" --end2end"
+CLIENTCMD="timeout 70s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -c 1 -w 1 --dest64 $BENID -s \"ben43@elixxir.io\" -f blob42 -m \"Hello from Rick42, with E2E Encryption\" --end2end"
 eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
-CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -c 1 -w 1 --dest64 $RICKID -s \"rick42@elixxir.io\" -f blob43 -m \"Hello from Ben43, with E2E Encryption\" --end2end"
+CLIENTCMD="timeout 70s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -c 1 -w 1 --dest64 $RICKID -s \"rick42@elixxir.io\" -f blob43 -m \"Hello from Ben43, with E2E Encryption\" --end2end"
 eval $CLIENTCMD >> $CLIENTOUT/client43.txt || true &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"

--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -10,6 +10,8 @@ skipReg: true
 # Log message level
 logLevel: 1

+useGpu: false
+
 node:
    id: ""
    paths:

--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -7,10 +7,11 @@
 # batch size
 batch: 4
 skipReg: true
-
 # Log message level
 logLevel: 1

+useGpu: false
+
 node:
    id: ""
    paths:

--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -10,6 +10,8 @@ skipReg: true
 # Log message level
 logLevel: 1

+useGpu: false
+
 node:
    id: ""
    paths:

--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -10,6 +10,8 @@ skipReg: true
 # Log message level
 logLevel: 1

+useGpu: false
+
 node:
    id: ""
    paths:

--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -10,6 +10,8 @@ skipReg: true
 # Log message level
 logLevel: 1

+useGpu: false
+
 node:
    id: ""
    paths:

--- a/smokeinfra/gateway-1.yaml
+++ b/smokeinfra/gateway-1.yaml
@@ -29,11 +29,12 @@ MessageTimeout: 1800

 # === REQUIRED FOR ENABLING TLS ===
 # Path to the gateway private key file
-keyPath: "../keys/gateway.cmix.rip.key"
+keyPath: "../keys/cmix.rip.key"
 # Path to the gateway certificate file
-certPath: "../keys/gateway.cmix.rip.crt"
+certPath: "../keys/cmix.rip.crt"
 # Path to the gateway certificate file
 serverCertPath: "../keys/cmix.rip.crt"
+IP_Whitelist_File: whitelist.txt

 ### Anything below this line is to be deprecated ###


--- a/smokeinfra/gateway-2.yaml
+++ b/smokeinfra/gateway-2.yaml
@@ -26,9 +26,9 @@ MessageTimeout: 1800

 # === REQUIRED FOR ENABLING TLS ===
 # Path to the gateway private key file
-keyPath: "../keys/gateway.cmix.rip.key"
+keyPath: "../keys/cmix.rip.key"
 # Path to the gateway certificate file
-certPath: "../keys/gateway.cmix.rip.crt"
+certPath: "../keys/cmix.rip.crt"
 # Path to the gateway certificate file
 serverCertPath: "../keys/cmix.rip.crt"


--- a/smokeinfra/gateway-3.yaml
+++ b/smokeinfra/gateway-3.yaml
@@ -29,9 +29,9 @@ MessageTimeout: 1800

 # === REQUIRED FOR ENABLING TLS ===
 # Path to the gateway private key file
-keyPath: "../keys/gateway.cmix.rip.key"
+keyPath: "../keys/cmix.rip.key"
 # Path to the gateway certificate file
-certPath: "../keys/gateway.cmix.rip.crt"
+certPath: "../keys/cmix.rip.crt"
 # Path to the gateway certificate file
 serverCertPath: "../keys/cmix.rip.crt"


--- a/smokeinfra/permissioning.yaml
+++ b/smokeinfra/permissioning.yaml
+# ==================================
+# Permissioning Server Configuration
+# ==================================
+
+# Log message level
+logLevel: 1
+
+# Path to log file
+logPath: "results/permissioning.log"
+
+batchSize: 42
+
+# The listening port of this server
+port: 18000
+
+# Database connection information
+dbUsername: ""
+dbPassword: ""
+dbName: ""
+dbAddress: ""
+
+# List of Node registration codes (in order of network placement)
+registrationCodes:
+  - "AAAA"
+  - "BBBB"
+  - "CCCC"
+
+clientRegCodes:
+  - "FFFF"
+  - "GGGG"
+
+# === REQUIRED FOR ENABLING TLS ===
+# Path to the registration server private key file
+keyPath: "../keys/cmix.rip.key"
+# Path to the registration server certificate file
+certPath: "../keys/cmix.rip.crt"
+
+ndfOutputPath: "results/permissions-ndfoutput.json"
+
+# === REQUIRED FOR ENABLING TLS ===
+# Path to the private key file
+keyPath: "../keys/cmix.rip.key"
+# Path to the certificate file
+certPath: "../keys/cmix.rip.crt"
+# Path to the certificate file
+serverCertPath: "../keys/cmix.rip.crt"
+
+udbID: 3
+
+
+groups:
+  cmix:
+    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
+    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
+    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
+  e2e:
+    prime: "E2EE983D031DC1DB6F1A7A67DF0E9A8E5561DB8E8D49413394C049B7A8ACCEDC298708F121951D9CF920EC5D146727AA4AE535B0922C688B55B3DD2AEDF6C01C94764DAB937935AA83BE36E67760713AB44A6337C20E7861575E745D31F8B9E9AD8412118C62A3E2E29DF46B0864D0C951C394A5CBBDC6ADC718DD2A3E041023DBB5AB23EBB4742DE9C1687B5B34FA48C3521632C4A530E8FFB1BC51DADDF453B0B2717C2BC6669ED76B4BDD5C9FF558E88F26E5785302BEDBCA23EAC5ACE92096EE8A60642FB61E8F3D24990B8CB12EE448EEF78E184C7242DD161C7738F32BF29A841698978825B4111B4BC3E1E198455095958333D776D8B2BEEED3A1A1A221A6E37E664A64B83981C46FFDDC1A45E3D5211AAF8BFBC072768C4F50D7D7803D2D4F278DE8014A47323631D7E064DE81C0C6BFA43EF0E6998860F1390B5D3FEACAF1696015CB79C3F9C2D93D961120CD0E5F12CBB687EAB045241F96789C38E89D796138E6319BE62E35D87B1048CA28BE389B575E994DCA755471584A09EC723742DC35873847AEF49F66E43873"
+    smallprime: "71774C1E818EE0EDB78D3D33EF874D472AB0EDC746A4A099CA6024DBD456676E14C3847890CA8ECE7C90762E8A3393D525729AD849163445AAD9EE9576FB600E4A3B26D5C9BC9AD541DF1B733BB0389D5A25319BE1073C30ABAF3A2E98FC5CF4D6C20908C63151F1714EFA3584326864A8E1CA52E5DEE356E38C6E951F020811EDDAD591F5DA3A16F4E0B43DAD9A7D2461A90B19625298747FD8DE28ED6EFA29D85938BE15E3334F6BB5A5EEAE4FFAAC74479372BC29815F6DE511F562D674904B7745303217DB0F479E924C85C658977224777BC70C2639216E8B0E3B9C7995F94D420B4C4BC412DA088DA5E1F0F0CC22A84ACAC199EBBB6C595F7769D0D0D110D371BF3325325C1CC0E237FEEE0D22F1EA908D57C5FDE0393B4627A86BEBC01E96A793C6F400A523991B18EBF0326F40E0635FD21F78734CC430789C85AE9FF56578B4B00AE5BCE1FCE16C9ECB089066872F8965DB43F55822920FCB3C4E1C744EBCB09C7318CDF3171AEC3D882465145F1C4DABAF4CA6E53AAA38AC2504F6391BA16E1AC39C23D77A4FB3721C39"
+    generator: "2"
--- a/smokeinfra/run.sh
+++ b/smokeinfra/run.sh
@@ -12,12 +12,17 @@ GATEWAYLOGS=results/
 mkdir -p $SERVERLOGS
 mkdir -p $GATEWAYLOGS

+PERMCMD="../bin/permissioning -c permissioning.yaml"
+$PERMCMD > $SERVERLOGS/permissioning.log 2>&1 &
+PIDVAL=$!
+echo "$PERMCMD -- $PIDVAL"
+
 echo "STARTING SERVERS..."

 for SERVERID in $(seq 3 -1 1)
 do
    IDX=$(($SERVERID - 1))
-    SERVERCMD="../bin/server -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml --noTLS --disablePermissioning"
+    SERVERCMD="../bin/server -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml"
    $SERVERCMD > $SERVERLOGS/server-$SERVERID.console 2>&1 &
    PIDVAL=$!
    echo "$SERVERCMD -- $PIDVAL"
@@ -34,14 +39,12 @@ sleep 5
 for GWID in $(seq 3 -1 1)
 do
    IDX=$(($GWID - 1))
-    GATEWAYCMD="../bin/gateway -i $IDX --config gateway-$GWID.yaml --noTLS --disablePermissioning"
+    GATEWAYCMD="../bin/gateway -i $IDX --config gateway-$GWID.yaml"
    $GATEWAYCMD > $GATEWAYLOGS/gateway-$GWID.console 2>&1 &
    PIDVAL=$!
    echo "$GATEWAYCMD -- $PIDVAL"
 done

-sleep 120
-
 jobs -p > results/serverpids

 finish() {
@@ -57,13 +60,21 @@ finish() {
 trap finish EXIT
 trap finish INT

-sleep 15
-
+# Sleeps can die in a fire on the sun, we wait for the servers to run 2 rounds
+rm rid.txt || touch rid.txt
+cnt=0
+echo -n "Waiting for 2 rounds to run"
+while [ ! -s rid.txt ] && [ $cnt -lt 240 ]; do
+    sleep 1
+    cat results/server-3.log | grep "RID 1 ReceiveFinishRealtime END" > rid.txt || true
+    cnt=$(($cnt + 1))
+    echo -n "."
+done

 echo "CHECKING OUTPUT FOR ERRORS"
 set +x

-cat $SERVERLOGS/server-*.log | grep "ERROR" | grep -v "context" | grep -v "metrics" | grep -v "database" > results/server-errors.txt || true
+cat $SERVERLOGS/server-*.log | grep "ERROR" | grep -v "Poll error" | grep -v "RoundTripPing" | grep -v "context" | grep -v "metrics" | grep -v "database" > results/server-errors.txt || true
 cat $SERVERLOGS/server-*.log | grep "FATAL" |  grep -v "context" | grep -v "database" >> results/server-errors.txt || true
 diff -ruN results/server-errors.txt noerrors.txt


--- a/smokeinfra/server-1.yaml
+++ b/smokeinfra/server-1.yaml
@@ -29,16 +29,16 @@ database:
        - ""
 gateways:
    paths:
-        cert: "../keys/gateway.cmix.rip.crt"
+        cert: "../keys/cmix.rip.crt"
    addresses:
        - "localhost:9440"
        - "localhost:9441"
        - "localhost:9442"
 permissioning:
  paths:
-    cert: ""
-  address: ""
-  registrationCode: ""
+    cert: "../keys/cmix.rip.crt"
+  address: "localhost:18000"
+  registrationCode: "AAAA"
  publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
 groups:
  cmix:

--- a/smokeinfra/server-2.yaml
+++ b/smokeinfra/server-2.yaml
@@ -29,16 +29,16 @@ database:
        - ""
 gateways:
    paths:
-        cert: "../keys/gateway.cmix.rip.crt"
+        cert: "../keys/cmix.rip.crt"
    addresses:
        - "localhost:9440"
        - "localhost:9441"
        - "localhost:9442"
 permissioning:
  paths:
-    cert: ""
-  address: ""
-  registrationCode: ""
+    cert: "../keys/cmix.rip.crt"
+  address: "localhost:18000"
+  registrationCode: "BBBB"
  publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
 groups:
  cmix:

--- a/smokeinfra/server-3.yaml
+++ b/smokeinfra/server-3.yaml
@@ -29,16 +29,16 @@ database:
        - ""
 gateways:
    paths:
-        cert: "../keys/gateway.cmix.rip.crt"
+        cert: "../keys/cmix.rip.crt"
    addresses:
        - "localhost:9440"
        - "localhost:9441"
        - "localhost:9442"
 permissioning:
  paths:
-    cert: ""
-  address: ""
-  registrationCode: ""
+    cert: "../keys/cmix.rip.crt"
+  address: "localhost:18000"
+  registrationCode: "CCCC"
  publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
 groups:
  cmix:

--- a/smokeinfra/whitelist.txt
+++ b/smokeinfra/whitelist.txt
+test