[FAB-11207] Fix local integration tests

This change fixes override paths and matchers for host run
integration tests.

The scripts now also wait for the docker host to become available.

Change-Id: Id9e7017641cc372c30fa13f831d5ff96fb5ea6c7
Signed-off-by: Troy Ronda <troy@troyronda.com>

Author: troyronda

Makefile

@@ -193,7 +193,7 @@ endif
 BASE_DOCKER_COMPOSE_FILES := -f ./docker-compose.yaml
 ifeq ($(FABRIC_SDK_ENABLE_CHAINCODED),true)
 BASE_DOCKER_COMPOSE_FILES := -f ./docker-compose-chaincoded.yaml $(BASE_DOCKER_COMPOSE_FILES)
-export CORE_VM_ENDPOINT=http://chaincoded.example.com:2375
+export CORE_VM_ENDPOINT=http://chaincoded.example.com:9375
 else
 BASE_DOCKER_COMPOSE_FILES := -f ./docker-compose-std.yaml $(BASE_DOCKER_COMPOSE_FILES)
 endif

test/fixtures/config/overrides/local_entity_matchers_bootstrap.yaml

@@ -11,9 +11,16 @@ entityMatchers:
       sslTargetOverrideUrlSubstitutionExp: $1.org1.example.com
       mappedHost: local.peer0.org1.example.com
 
-    - pattern: peer0.org2.example.com:8051
-      urlSubstitutionExp: localhost:8051
-      sslTargetOverrideUrlSubstitutionExp: peer0.org2.example.com
+    ## TODO added below peer to ignore list, to avoid these revoked peer to conflict with bootstrap test
+    - pattern: peer1.org2.example.com:(\d+)
+      ignoreEndpoint: true
+
+    - pattern: peer1.org2.example.com
+      ignoreEndpoint: true
+
+    - pattern: (\w+).org2.example.com:(\d+)
+      urlSubstitutionExp: localhost:$2
+      sslTargetOverrideUrlSubstitutionExp: $1.org2.example.com
       mappedHost: local.peer0.org2.example.com
 
   orderer:

test/fixtures/dockerenv/docker-compose-chaincoded.yaml

@@ -31,13 +31,15 @@ services:
       - ../../../test/fixtures/testdata/src/github.com/example_pvt_cc:/opt/gopath/src/github.com/example_pvt_cc
     command: /opt/gopath/src/github.com/hyperledger/fabric-sdk-go/test/scripts/chaincoded.sh
     #comment out logging.driver in order to render the debug logs
-    logging:
-      driver: none
+    #logging:
+    #  driver: none
     networks:
       default:
         aliases:
           - chaincoded.example.com
+    ports:
+      - "9375:9375"
     expose:
-      - "2375"
+      - "9375"
     depends_on:
       - dockerd

test/fixtures/dockerenv/docker-compose-negative.yaml

@@ -18,6 +18,7 @@ services:
       - FABRIC_FIXTURE_VERSION
       - FABRIC_SDK_CLIENT_EVENTSERVICE_TYPE
       - TEST_CHANGED_ONLY
+      - CORE_VM_ENDPOINT
     volumes:
       - ../../../:/opt/gopath/src/github.com/hyperledger/fabric-sdk-go
     command: /opt/gopath/src/github.com/hyperledger/fabric-sdk-go/test/scripts/negative.sh

test/fixtures/dockerenv/docker-compose-nopkcs11-test.yaml

@@ -19,6 +19,7 @@ services:
       - FABRIC_SDK_CLIENT_EVENTSERVICE_TYPE
       - E2E_ONLY
       - TEST_CHANGED_ONLY
+      - CORE_VM_ENDPOINT
     volumes:
       - ../../../:/opt/gopath/src/github.com/hyperledger/fabric-sdk-go
     command: /opt/gopath/src/github.com/hyperledger/fabric-sdk-go/test/scripts/integration.sh

test/fixtures/dockerenv/docker-compose-pkcs11-test.yaml

@@ -19,6 +19,7 @@ services:
       - FABRIC_FIXTURE_VERSION
       - FABRIC_SDK_CLIENT_EVENTSERVICE_TYPE
       - TEST_CHANGED_ONLY
+      - CORE_VM_ENDPOINT
     volumes:
       - ../../../:/opt/gopath/src/github.com/hyperledger/fabric-sdk-go
     command: bash -c "/opt/gopath/src/github.com/hyperledger/fabric-sdk-go/test/scripts/unit-pkcs11.sh && /opt/gopath/src/github.com/hyperledger/fabric-sdk-go/test/scripts/integration-pkcs11.sh"

test/integration/base_test_setup.go

@@ -164,7 +164,7 @@ func GetConfigPath(filename string) string {
 
 // GetConfigOverridesPath returns the path to the named config override fixture file
 func GetConfigOverridesPath(filename string) string {
-	const configPath = "test/fixtures/config/overrides"
+	const configPath = "test/fixtures/config"
 	return path.Join(goPath(), "src", metadata.Project, configPath, "overrides", filename)
 }
 

test/scripts/chaincoded.sh

@@ -13,6 +13,7 @@ GOPATH="${GOPATH:-$HOME/go}"
 mkdir -p ${GOPATH}/src/github.com/hyperledger
 ln -s ${GOPATH}/src/chaincoded/vendor/github.com/hyperledger/fabric ${GOPATH}/src/github.com/hyperledger/fabric
 
+echo "Installing chaincodes ..."
 go install github.com/example_cc
 go install github.com/example_pvt_cc
 go install chaincoded/cmd/chaincoded
@@ -24,4 +25,6 @@ PEERS=(
     peer1.org2.example.com:9052
 )
 
-chaincoded ":2375" ${PEERS[@]}
+# Remove dev/null redirection to see chaincode logs
+echo "Running chaincoded ..."
+chaincoded ":9375" ${PEERS[@]} > /dev/null 2> /dev/null

test/scripts/integration-pkcs11.sh

@@ -34,6 +34,7 @@ SCRIPT_DIR="$(dirname "$0")"
 REPO="github.com/hyperledger/fabric-sdk-go"
 
 source ${SCRIPT_DIR}/lib/find_packages.sh
+source ${SCRIPT_DIR}/lib/docker.sh
 
 echo "Running" $(basename "$0")
 
@@ -96,6 +97,8 @@ do
     rm -rf private.p8
 done
 
+waitForCoreVMUp
+
 echo "Code level ${FABRIC_SDKGO_CODELEVEL_TAG} (Fabric ${FABRIC_FIXTURE_VERSION})"
 echo "Running integration tests ..."
 

test/scripts/integration.sh

@@ -34,6 +34,7 @@ SCRIPT_DIR="$(dirname "$0")"
 REPO="github.com/hyperledger/fabric-sdk-go"
 
 source ${SCRIPT_DIR}/lib/find_packages.sh
+source ${SCRIPT_DIR}/lib/docker.sh
 
 echo "Running" $(basename "$0")
 
@@ -84,6 +85,8 @@ if [ ${#PKGS[@]} -eq 0 ]; then
     exit 0
 fi
 
+waitForCoreVMUp
+
 echo "Code level ${FABRIC_SDKGO_CODELEVEL_TAG} (Fabric ${FABRIC_FIXTURE_VERSION})"
 echo "Running integration tests ..."