[FAB-11040] Organize integration tests folder

This change removes hard-coded relative folder paths and splits
existing integration tests into subfolders.

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

Makefile

@@ -44,6 +44,7 @@ FABRIC_SDK_EXPERIMENTAL    ?= true
 FABRIC_SDK_EXTRA_GO_TAGS   ?=
 FABRIC_SDK_POPULATE_VENDOR ?= true
 FABRIC_SDK_CHAINCODED      ?= false
+FABRIC_SDKGO_TESTRUN_ID    ?= $(shell date +'%Y%m%d%H%M%S')
 
 # Fabric tool versions (overridable)
 FABRIC_TOOLS_VERSION ?= $(FABRIC_STABLE_VERSION)
@@ -134,9 +135,9 @@ FABRIC_DEV_REGISTRY := $(FABRIC_DEV_REGISTRY)/
 endif
 
 # Fabric tool docker tags at code levels
-FABRIC_TOOLS_STABLE_TAG     := $(ARCH)-$(FABRIC_STABLE_VERSION)
-FABRIC_TOOLS_PREV_TAG       := $(FABRIC_ARCH)-$(FABRIC_PREV_VERSION)
-FABRIC_TOOLS_PRERELEASE_TAG := $(FABRIC_ARCH)-$(FABRIC_PRERELEASE_VERSION)
+FABRIC_TOOLS_STABLE_TAG     = $(FABRIC_ARCH)-$(FABRIC_STABLE_VERSION)
+FABRIC_TOOLS_PREV_TAG       = $(FABRIC_ARCH)-$(FABRIC_PREV_VERSION)
+FABRIC_TOOLS_PRERELEASE_TAG = $(FABRIC_ARCH)-$(FABRIC_PRERELEASE_VERSION)
 FABRIC_TOOLS_DEVSTABLE_TAG  := stable
 
 # The version of dep that will be installed by depend (or in the CI)
@@ -209,6 +210,7 @@ export GO_TAGS
 export GO_TESTFLAGS
 export DOCKER_CMD
 export DOCKER_COMPOSE_CMD
+export FABRIC_SDKGO_TESTRUN_ID
 
 .PHONY: all
 all: depend-noforce license unit-test integration-test

README.md

@@ -23,9 +23,9 @@ You're good to go, happy coding! Check out the examples for usage demonstrations
 ### Examples
 
 - [E2E Test](test/integration/e2e/end_to_end.go): Basic example that uses SDK to query and execute transaction
-- [Ledger Query Test](test/integration/sdk/ledger_queries_test.go): Basic example that uses SDK to query a channel's underlying ledger
-- [Multi Org Test](test/integration/orgs/multiple_orgs_test.go): An example that has multiple organisations involved in transaction
-- [Dynamic Endorser Selection](test/integration/sdk/sdk_provider_test.go): An example that uses dynamic endorser selection (based on chaincode policy)
+- [Ledger Query Test](test/integration/pkg/client/ledger/ledger_queries_test.go): Basic example that uses SDK to query a channel's underlying ledger
+- [Multi Org Test](test/integration/e2e/orgs/multiple_orgs_test.go): An example that has multiple organisations involved in transaction
+- [Dynamic Endorser Selection](test/integration/pkg/fabsdk/provider/sdk_provider_test.go): An example that uses dynamic endorser selection (based on chaincode policy)
 - [E2E PKCS11 Test](test/integration/e2e/pkcs11/e2e_test.go): E2E Test using a PKCS11 crypto suite and configuration
 - [CLI](https://github.com/securekey/fabric-examples/tree/master/fabric-cli/): An example CLI for Fabric built with the Go SDK.
 - More examples needed!