Enable TLS FV Tests

- set flag in CI
- add in paths to orgs's certs
- adding in missing logging container to docker-compose

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

ci/azure-pipelines.yml

@@ -153,6 +153,7 @@ stages:
               displayName: 'Get the latest master docker images'
             - script: |
                 set -ev
+                export TLS=true
                 node common/scripts/install-run-rush.js start-fabric
                 node common/scripts/install-run-rush.js start-verdaccio # script will check for the ci variable and use built images
                 docker images | grep hyperledger && docker ps -a

test/fv/utils.js

@@ -12,7 +12,8 @@ const fs = require('fs');
 const path = require('path');
 const ip = require('ip');
 
-
+const org1CA = '/etc/hyperledger/config/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem';
+const org2CA = '/etc/hyperledger/config/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem';
 const ordererCA = '/etc/hyperledger/config/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem';
 const tls = process.env.TLS && process.env.TLS.toLowerCase() === 'true' ? true : false;
 const getTLSArgs = () => {

tools/toolchain/network/docker-compose/docker-compose-tls.yaml

@@ -175,3 +175,12 @@ services:
       - /var/run/:/host/var/run/
     depends_on:
       - peer0.org2.example.com
+
+  logging:
+    container_name: logging
+    image: gliderlabs/logspout
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./logs:/logs
+    ports:
+    - 17056:80