[FABG-811] Update to Fabric 1.4.0

This change updates the test target for stable to 1.4.0.
Prev is updated to 1.3.0.

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

Makefile

@@ -26,18 +26,17 @@ DOCKER_CMD         ?= docker
 DOCKER_COMPOSE_CMD ?= docker-compose
 
 # Fabric versions used in the Makefile
-FABRIC_STABLE_VERSION           := 1.3.0
-FABRIC_STABLE_VERSION_MINOR     := 1.3
+FABRIC_STABLE_VERSION           := 1.4.0
+FABRIC_STABLE_VERSION_MINOR     := 1.4
 FABRIC_STABLE_VERSION_MAJOR     := 1
 FABRIC_BASEIMAGE_STABLE_VERSION := 0.4.14
 
-FABRIC_PRERELEASE_VERSION       := 1.4.0-rc2
-FABRIC_PRERELEASE_VERSION_MINOR := 1.4
-FABRIC_PREV_VERSION             := 1.2.1
-FABRIC_PREV_VERSION_MINOR       := 1.2
-FABRIC_DEVSTABLE_VERSION_MINOR  := 1.3
+FABRIC_PRERELEASE_VERSION       :=
+FABRIC_PRERELEASE_VERSION_MINOR :=
+FABRIC_PREV_VERSION             := 1.3.0
+FABRIC_PREV_VERSION_MINOR       := 1.3
+FABRIC_DEVSTABLE_VERSION_MINOR  := 1.4
 FABRIC_DEVSTABLE_VERSION_MAJOR  := 1
-FABRIC_PREV_VERSION_MINOR       := 1.2
 
 # Build flags (overridable)
 GO_LDFLAGS                 ?=
@@ -70,9 +69,9 @@ FABRIC_DEV_REGISTRY_PRE_CMD ?= docker login -u docker -p docker nexus3.hyperledg
 
 # Upstream fabric patching (overridable)
 THIRDPARTY_FABRIC_CA_BRANCH ?= master
-THIRDPARTY_FABRIC_CA_COMMIT ?= v1.4.0-rc2
+THIRDPARTY_FABRIC_CA_COMMIT ?= v1.4.0
 THIRDPARTY_FABRIC_BRANCH    ?= master
-THIRDPARTY_FABRIC_COMMIT    ?= v1.4.0-rc2
+THIRDPARTY_FABRIC_COMMIT    ?= v1.4.0
 
 # Force removal of images in cleanup (overridable)
 FIXTURE_DOCKER_REMOVE_FORCE ?= false

README.md

@@ -40,17 +40,18 @@ You're good to go, happy coding! Check out the examples for usage demonstrations
 
 ### Current Compatibility
 The SDK's integration tests run against three tagged Fabric versions:
-- prev (currently v1.2.1)
-- stable (currently v1.3.0)
+- prev (currently v1.3.0)
+- stable (currently v1.4.0)
 - prerelease (currently disabled)
 
 Additionally for development purposes integration tests also run against the devstable Fabric version as needed.
 
 ### Retired versions
 When the 'prev' code level is updated, the last tested fabric-sdk-go commit or tag is listed below.
 
-- fabric v1.2 & fabric-ca v1.2
-- fabric-sdk-go: ea10f6c
+- fabric v1.2: 3b2b876
+- fabric v1.1: f7ae259
+- fabric v1.0: 5ac5226
 
 ### Running the test suite
 

test/fixtures/dockerenv/.env

@@ -18,13 +18,13 @@ COMPOSE_PROJECT_NAME=fabsdkgo
 FABRIC_DOCKER_REGISTRY=
 FABRIC_BASE_DOCKER_REGISTRY=
 
-FABRIC_FIXTURE_VERSION=v1.3
+FABRIC_FIXTURE_VERSION=v1.4
 FABRIC_CRYPTOCONFIG_VERSION=v1
 
-FABRIC_CA_FIXTURE_TAG=1.3.0
-FABRIC_ORDERER_FIXTURE_TAG=1.3.0
-FABRIC_PEER_FIXTURE_TAG=1.3.0
-FABRIC_BUILDER_FIXTURE_TAG=1.3.0
+FABRIC_CA_FIXTURE_TAG=1.4.0
+FABRIC_ORDERER_FIXTURE_TAG=1.4.0
+FABRIC_PEER_FIXTURE_TAG=1.4.0
+FABRIC_BUILDER_FIXTURE_TAG=1.4.0
 FABRIC_COUCHDB_FIXTURE_TAG=0.4.14
 FABRIC_BASEOS_FIXTURE_TAG=0.4.14
 FABRIC_BASEIMAGE_FIXTURE_TAG=0.4.14

test/fixtures/dockerenv/prev-env.sh

@@ -8,14 +8,10 @@
 # This file contains environment overrides to enable testing
 # against the latest pre-release target.
 
-export FABRIC_FIXTURE_VERSION="v1.2"
+export FABRIC_FIXTURE_VERSION="v1.3"
 export FABRIC_CRYPTOCONFIG_VERSION="v1"
 
-export FABRIC_CA_FIXTURE_TAG="1.2.1"
-export FABRIC_ORDERER_FIXTURE_TAG="1.2.1"
-export FABRIC_PEER_FIXTURE_TAG="1.2.1"
-export FABRIC_BUILDER_FIXTURE_TAG="1.2.1"
-
-# override configuration that loads crypto-config
-export FABRIC_SDK_CLIENT_CRYPTOCONFIG_PATH='${GOPATH}'"/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabric/${FABRIC_CRYPTOCONFIG_VERSION}/crypto-config"
-export FABRIC_SDK_CLIENT_ORDERERS_TLSCACERTS_PATH='${GOPATH}'"/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabric/${FABRIC_CRYPTOCONFIG_VERSION}/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem"
+export FABRIC_CA_FIXTURE_TAG="1.3.0"
+export FABRIC_ORDERER_FIXTURE_TAG="1.3.0"
+export FABRIC_PEER_FIXTURE_TAG="1.3.0"
+export FABRIC_BUILDER_FIXTURE_TAG="1.3.0"