[FABG-767] Update to Fabric 1.2.1

This change updates the tests to target Fabric 1.2.1. The other targets are also updated to their latests. Change-Id: I2d2b0839797021f88b051d0e6dc247f12758eec1 Signed-off-by: Troy Ronda <[email protected]>
hyperledger · Sep 28, 2018 · f10bc6b · f10bc6b
1 parent ea10f6c
commit f10bc6b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 37 deletions.
diff --git a/Makefile b/Makefile
@@ -26,12 +26,12 @@ DOCKER_CMD         ?= docker
 DOCKER_COMPOSE_CMD ?= docker-compose
 
 # Fabric versions used in the Makefile
-FABRIC_STABLE_VERSION           := 1.2.0
+FABRIC_STABLE_VERSION           := 1.2.1
 FABRIC_STABLE_VERSION_MINOR     := 1.2
 FABRIC_STABLE_VERSION_MAJOR     := 1
 FABRIC_BASEIMAGE_STABLE_VERSION := 0.4.10
 
-FABRIC_PRERELEASE_VERSION       :=
+FABRIC_PRERELEASE_VERSION       := 1.3.0-rc1
 FABRIC_PREV_VERSION             := 1.1.0
 FABRIC_DEVSTABLE_VERSION_MINOR  := 1.3
 FABRIC_DEVSTABLE_VERSION_MAJOR  := 1
@@ -303,13 +303,11 @@ unit-tests-pkcs11: clean-tests depend-noforce populate-noforce license
 integration-tests-stable: clean-tests depend-noforce populate-noforce
 	@. $(FIXTURE_DOCKERENV_PATH)/stable-env.sh && \
 	    . $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
-		$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
-		cd $(FIXTURE_DOCKERENV_PATH) && \
-		FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) pull $(DOCKER_COMPOSE_PULL_FLAGS) && \
-		TEST_CHANGED_ONLY=$(FABRIC_SDKGO_TEST_CHANGED) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
+	    cd $(FIXTURE_DOCKERENV_PATH) && \
+		TEST_CHANGED_ONLY=$(FABRIC_SDKGO_TEST_CHANGED) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
 		GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
 		$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-nopkcs11-test.yaml up $(DOCKER_COMPOSE_UP_TEST_FLAGS)
-	@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-nopkcs11-test.yaml"
+	@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-nopkcs11-test.yaml"
 
 .PHONY: integration-tests-prev
 integration-tests-prev: clean-tests depend-noforce populate-noforce populate-fixtures-prev-noforce
@@ -347,25 +345,21 @@ integration-tests-devstable: clean-tests depend-noforce populate-noforce populat
 integration-tests-stable-negative: clean-tests depend-noforce populate-noforce
 	@. $(FIXTURE_DOCKERENV_PATH)/stable-env.sh && \
 	    . $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
-		$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
 		cd $(FIXTURE_DOCKERENV_PATH) && \
-		FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) pull $(DOCKER_COMPOSE_PULL_FLAGS) && \
-		TEST_CHANGED_ONLY=$(FABRIC_SDKGO_TEST_CHANGED) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
+		TEST_CHANGED_ONLY=$(FABRIC_SDKGO_TEST_CHANGED) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
 		GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
 		$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-negative.yaml up $(DOCKER_COMPOSE_UP_TEST_FLAGS)
-	@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-negative.yaml"
+	@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-negative.yaml"
 
 .PHONY: integration-tests-stable-pkcs11
 integration-tests-stable-pkcs11: clean-tests depend-noforce populate-noforce
 	@. $(FIXTURE_DOCKERENV_PATH)/stable-env.sh && \
 	    . $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
-		$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
 		cd $(FIXTURE_DOCKERENV_PATH) && \
-		FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) pull $(DOCKER_COMPOSE_PULL_FLAGS) && \
-		TEST_CHANGED_ONLY=$(FABRIC_SDKGO_TEST_CHANGED) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
+		TEST_CHANGED_ONLY=$(FABRIC_SDKGO_TEST_CHANGED) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
 		GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
 		$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-pkcs11-test.yaml up $(DOCKER_COMPOSE_UP_TEST_FLAGS)
-	@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-pkcs11-test.yaml"
+	@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-pkcs11-test.yaml"
 
 # Additional test cases that aren't currently run by the CI
 .PHONY: integration-tests-devstable-nomutualtls
@@ -429,10 +423,8 @@ integration-tests-local: clean-tests-temp depend-noforce populate-noforce
 integration-tests-stable-local: clean-tests-temp depend-noforce populate-noforce
 	@. $(FIXTURE_DOCKERENV_PATH)/stable-env.sh && \
 	    . $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
-		$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
 		cd $(FIXTURE_DOCKERENV_PATH) && \
-		FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) pull $(DOCKER_COMPOSE_PULL_FLAGS) && \
-		FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
+		FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
 		TEST_CHANGED_ONLY=$(FABRIC_SDKGO_TEST_CHANGED) GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
 		$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up $(DOCKER_COMPOSE_UP_BACKGROUND_FLAGS)
 	FABRIC_CRYPTOCONFIG_VERSION=$(FABRIC_CRYPTOCONFIG_VER) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_CODELEVEL_TAG) TEST_LOCAL=true  $(TEST_SCRIPTS_PATH)/integration.sh
@@ -464,10 +456,8 @@ dockerenv-prev-up: clean-tests populate-fixtures-prev-noforce
 dockerenv-stable-up: clean-tests populate-fixtures-stable-noforce
 	@. $(FIXTURE_DOCKERENV_PATH)/stable-env.sh && \
 	    . $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
-		$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
 		cd $(FIXTURE_DOCKERENV_PATH) && \
-		FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) pull $(DOCKER_COMPOSE_PULL_FLAGS) && \
-		FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
+		FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
 		$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up $(DOCKER_COMPOSE_UP_STANDALONE_FLAGS)
 
 .PHONY: dockerenv-prerelease-up

diff --git a/README.md b/README.md
@@ -40,8 +40,8 @@ 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.1.0)
-- stable (currently v1.2.0)
+- prev (currently v1.1.1)
+- stable (currently v1.2.1)
 - prerelease (currently disabled)
 
 Additionally for development purposes integration tests also run against the devstable Fabric version as needed.

diff --git a/test/fixtures/dockerenv/.env b/test/fixtures/dockerenv/.env
@@ -21,10 +21,10 @@ FABRIC_BASE_DOCKER_REGISTRY=
 FABRIC_FIXTURE_VERSION=v1.2
 FABRIC_CRYPTOCONFIG_VERSION=v1
 
-FABRIC_CA_FIXTURE_TAG=1.2.0
-FABRIC_ORDERER_FIXTURE_TAG=1.2.0
-FABRIC_PEER_FIXTURE_TAG=1.2.0
-FABRIC_BUILDER_FIXTURE_TAG=1.2.0
+FABRIC_CA_FIXTURE_TAG=1.2.1
+FABRIC_ORDERER_FIXTURE_TAG=1.2.1
+FABRIC_PEER_FIXTURE_TAG=1.2.1
+FABRIC_BUILDER_FIXTURE_TAG=1.2.1
 FABRIC_COUCHDB_FIXTURE_TAG=0.4.10
 FABRIC_BASEOS_FIXTURE_TAG=0.4.10
 FABRIC_BASEIMAGE_FIXTURE_TAG=0.4.10

diff --git a/test/fixtures/dockerenv/prerelease-env.sh b/test/fixtures/dockerenv/prerelease-env.sh
@@ -7,13 +7,13 @@
 
 # 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.0-rc1"
-export FABRIC_ORDERER_FIXTURE_TAG="1.2.0-rc1"
-export FABRIC_PEER_FIXTURE_TAG="1.2.0-rc1"
-export FABRIC_BUILDER_FIXTURE_TAG="1.2.0-rc1"
+export FABRIC_CA_FIXTURE_TAG="1.3.0-rc1"
+export FABRIC_ORDERER_FIXTURE_TAG="1.3.0-rc1"
+export FABRIC_PEER_FIXTURE_TAG="1.3.0-rc1"
+export FABRIC_BUILDER_FIXTURE_TAG="1.3.0-rc1"
 
 # override SDK 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"

diff --git a/test/fixtures/dockerenv/stable-env.sh b/test/fixtures/dockerenv/stable-env.sh
@@ -8,8 +8,3 @@
 # This file contains environment overrides to enable testing against
 # the stable target
 
-export FABRIC_CA_FIXTURE_TAG="1.2.1-stable"
-export FABRIC_ORDERER_FIXTURE_TAG="1.2.1-stable"
-export FABRIC_PEER_FIXTURE_TAG="1.2.1-stable"
-export FABRIC_COUCHDB_FIXTURE_TAG="1.2.1-stable"
-export FABRIC_BUILDER_FIXTURE_TAG="1.2.1-stable"