From 4ecec8193c1deb1b15409b89c3b78d7cc326dfa6 Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick@privategrity.com>
Date: Mon, 19 Aug 2019 23:42:34 +0000
Subject: [PATCH] Updates for RSA Registration
---
.gitlab-ci.yml | 1 +
basice2e/run.sh | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec34312..06a0157 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,6 +93,7 @@ basice2eTLS:
- 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:
diff --git a/basice2e/run.sh b/basice2e/run.sh
index b4b7429..9a8c18b 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -16,7 +16,7 @@ DUMMYOUT=results/dummy.console
UDBOUT=results/udb.console
CLIENTCLEAN=results/clients-cleaned
-CLIENTOPTS="-n ndf.json --skipNDFVerification"
+CLIENTOPTS="-n ndf.json --skipNDFVerification --noTLS"
mkdir -p $SERVERLOGS
mkdir -p $GATEWAYLOGS
@@ -25,7 +25,7 @@ mkdir -p $CLIENTCLEAN
echo "STARTING SERVERS..."
-PERMCMD="../bin/permissioning -c permissioning.yaml -k dsa.json"
+PERMCMD="../bin/permissioning -c permissioning.yaml -k dsa.json --noTLS"
$PERMCMD > $SERVERLOGS/permissioning.log 2>&1 &
PIDVAL=$!
echo "$PERMCMD -- $PIDVAL"
@@ -33,7 +33,7 @@ echo "$PERMCMD -- $PIDVAL"
for SERVERID in $(seq 5 -1 1)
do
IDX=$(($SERVERID - 1))
- SERVERCMD="../bin/server --disablePermissioning -v -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml --keyPairOverride dsa.json"
+ SERVERCMD="../bin/server --disablePermissioning --noTLS -v -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml"
if [ $SERVERID -eq 4 ]; then
sleep 15 # This will force a CDE timeout
fi
@@ -48,7 +48,7 @@ sleep 15 # Give servers some time to boot
for GWID in $(seq 5 -1 1)
do
IDX=$(($GWID - 1))
- GATEWAYCMD="../bin/gateway -v -i $IDX --disablePermissioning --config gateway-$GWID.yaml"
+ GATEWAYCMD="../bin/gateway -v -i $IDX --disablePermissioning --noTLS --config gateway-$GWID.yaml"
$GATEWAYCMD > $GATEWAYLOGS/gateway-$GWID.console 2>&1 &
PIDVAL=$!
echo "$GATEWAYCMD -- $PIDVAL"
--
GitLab