[ FAB-6976 ] Default timeout for cluster test

The cluster test pre-dated the default timeout change, and has an inconsistent value (30s). This is causing some intermittent failures in CI, so eliminating the explicit timeout (-o 30) and taking the new default. Change-Id: I51652e626506e0ac0f9a3029b08fbb4a931545b9 Signed-off-by: Allen Bailey <[email protected]>
hyperledger · Nov 13, 2017 · eb3eac0 · eb3eac0
1 parent 797d745
commit eb3eac0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scripts/fvt/cluster_test.sh b/scripts/fvt/cluster_test.sh
@@ -249,11 +249,11 @@ EOF
 
    # Start all Root and intermediate CAs
    echo -e "   >>>>>>>>>>  Starting $NUMSERVER Root CA instances with $NUMCAS servers each"
-   $SCRIPTDIR/fabric-ca_setup.sh -N -X -o 30 -x $ROOTDIR -S -n $NUMSERVER -D -d $DBdriver \
+   $SCRIPTDIR/fabric-ca_setup.sh -N -X -x $ROOTDIR -S -n $NUMSERVER -D -d $DBdriver \
                                  -- "--cafiles" "$rootCafiles" >> $ROOTDIR/log.txt 2>&1 ||
                                  ErrorExit "Failed to start root servers"
    echo -e "   >>>>>>>>>>  Starting $NUMSERVER Intermediate CA instances with $NUMCAS servers each"
-   $SCRIPTDIR/fabric-ca_setup.sh -o 30 -n $NUMSERVER -S -r $INTERMEDIATE_CA_DEFAULT_PORT -x $INTDIR \
+   $SCRIPTDIR/fabric-ca_setup.sh -n $NUMSERVER -S -r $INTERMEDIATE_CA_DEFAULT_PORT -x $INTDIR \
                                  -U "https://$INTUSER:$INTPSWD@$ROOT_CA_ADDR:$PROXY_PORT" \
                                  --  "--cafiles" "$intermediateCafiles" >> $INTDIR/log.txt 2>&1 ||
                                  ErrorExit "Failed to intermediate servers"