[FAB-9229] Enable CI target for Fabric 1.2

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

Author: troyronda

Makefile

@@ -34,7 +34,7 @@ FABRIC_BASEIMAGE_STABLE_VERSION := 0.4.6
 
 FABRIC_PRERELEASE_VERSION       := 1.1.0
 FABRIC_PREV_VERSION             := 1.0.6
-FABRIC_DEVSTABLE_VERSION_MINOR  := 1.1
+FABRIC_DEVSTABLE_VERSION_MINOR  := 1.2
 FABRIC_DEVSTABLE_VERSION_MAJOR  := 1
 FABRIC_PREV_VERSION_MINOR       := 1.0
 
@@ -89,7 +89,7 @@ FABRIC_DEVSTABLE_INTTEST      ?= false
 FABRIC_STABLE_CODELEVEL_TAG     := stable
 FABRIC_PREV_CODELEVEL_TAG       := prev
 FABRIC_PRERELEASE_CODELEVEL_TAG := prerelease
-FABRIC_DEVSTABLE_CODELEVEL_TAG  := devstable
+FABRIC_DEVSTABLE_CODELEVEL_TAG  := latest
 FABRIC_CODELEVEL_TAG            ?= $(FABRIC_STABLE_CODELEVEL_TAG)
 
 # Code level version targets
@@ -127,7 +127,7 @@ endif
 FABRIC_TOOLS_STABLE_TAG     := $(ARCH)-$(FABRIC_STABLE_VERSION)
 FABRIC_TOOLS_PREV_TAG       := $(ARCH)-$(FABRIC_PREV_VERSION)
 FABRIC_TOOLS_PRERELEASE_TAG := $(ARCH)-$(FABRIC_PRERELEASE_VERSION)
-FABRIC_TOOLS_DEVSTABLE_TAG  := DEV_STABLE
+FABRIC_TOOLS_DEVSTABLE_TAG  := latest
 
 # The version of dep that will be installed by depend-install (or in the CI)
 GO_DEP_COMMIT := v0.4.1
@@ -143,7 +143,7 @@ FABRIC_STABLE_PKCS11_INTTEST     := true
 FABRIC_STABLE_REVOKED_INTTEST    := true
 FABRIC_PREV_INTTEST              := true
 FABRIC_PRERELEASE_INTTEST        := false
-FABRIC_DEVSTABLE_INTTEST         := false
+FABRIC_DEVSTABLE_INTTEST         := true
 endif
 
 # Setup Go Tags
@@ -249,7 +249,7 @@ integration-tests-devstable: clean depend populate
 	@. $(FIXTURE_DOCKERENV_PATH)/devstable-env.sh && \
 		$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
 		cd $(FIXTURE_DOCKERENV_PATH) && \
-		FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_DEVSTABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_DEVSTABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY)/ $(DOCKER_COMPOSE_CMD) -f docker-compose.yaml -f docker-compose-nopkcs11-test.yaml up --force-recreate --abort-on-container-exit
+		FABRIC_FIXTURE_VERSION=v$(FABRIC_DEVSTABLE_VERSION_MINOR) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_DEVSTABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_DEVSTABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY)/ $(DOCKER_COMPOSE_CMD) -f docker-compose.yaml -f docker-compose-nopkcs11-test.yaml up --force-recreate --abort-on-container-exit
 	@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY)/ $(FIXTURE_SCRIPTS_PATH)/check_status.sh "-f ./docker-compose.yaml -f ./docker-compose-nopkcs11-test.yaml"
 
 .PHONY: integration-tests-stable-revoked

test/fixtures/dockerenv/devstable-env.sh

@@ -12,14 +12,14 @@
 export ARCH=""
 export ARCH_SEP=""
 
-export FABRIC_FIXTURE_VERSION="v1.1"
+export FABRIC_FIXTURE_VERSION="v1.2"
 export FABRIC_CRYPTOCONFIG_VERSION="v1"
 
-export FABRIC_CA_FIXTURE_TAG="DEV_STABLE"
-export FABRIC_ORDERER_FIXTURE_TAG="DEV_STABLE"
-export FABRIC_PEER_FIXTURE_TAG="DEV_STABLE"
-export FABRIC_COUCHDB_FIXTURE_TAG="DEV_STABLE"
-export FABRIC_BUILDER_FIXTURE_TAG="DEV_STABLE"
+export FABRIC_CA_FIXTURE_TAG="latest"
+export FABRIC_ORDERER_FIXTURE_TAG="latest"
+export FABRIC_PEER_FIXTURE_TAG="latest"
+export FABRIC_COUCHDB_FIXTURE_TAG="latest"
+export FABRIC_BUILDER_FIXTURE_TAG="latest"
 
 # 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"