Merge branch 'release' of gitlab.com:elixxir/integration into release

basice2e/run.sh

@@ -5,7 +5,7 @@
 set -e
 
 rm -fr results.bak || true
-mv results results.bak || true
+mv results results.bak || rm -fr results || true
 rm -fr blob* || true
 rm *-contact.json || true
 rm server-5.qdstrm || true
@@ -371,7 +371,7 @@ wait $PIDVAL2
 echo "TESTING SINGLE-USE"
 
 # Generate contact file for client52
-CLIENTCMD="../bin/client init -s blob52 -l results/client52.log --password hello --ndf ndf.json --writeContact $CLIENTOUT/jono52-contact.bin"
+CLIENTCMD="../bin/client init -s blob52 -l $CLIENTOUT/client52.log --password hello --ndf ndf.json --writeContact $CLIENTOUT/jono52-contact.bin"
 eval $CLIENTCMD >> /dev/null 2>&1 || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"

basice2e/server-1.yaml

@@ -8,6 +8,7 @@
 registrationCode: "qpol"
 useGPU: false
 devMode: true
+logLevel: 1
 node:
     paths:
         idf:  "results/servers/nodeID-1.json"

basice2e/server-2.yaml

@@ -8,6 +8,7 @@
 registrationCode: "yiiq"
 useGPU: false
 devMode: true
+logLevel: 1
 node:
     paths:
         idf:  "results/servers/nodeID-2.json"

basice2e/server-3.yaml

@@ -8,6 +8,7 @@
 registrationCode: "vydz"
 useGPU: false
 devMode: true
+logLevel: 1
 node:
     paths:
         idf:  "results/servers/nodeID-3.json"

basice2e/server-4.yaml

@@ -8,6 +8,7 @@
 registrationCode: "gwxs"
 useGPU: false
 devMode: true
+logLevel: 1
 node:
     paths:
         idf:  "results/servers/nodeID-4.json"

basice2e/server-5.yaml

@@ -8,6 +8,7 @@
 registrationCode: "nahv"
 useGPU: false
 devMode: true
+logLevel: 1
 node:
     paths:
         idf:  "results/servers/nodeID-5.json"