Skip to content

Commit

Permalink
[FABG-804] Update prerelease target to 1.4 RC2
Browse files Browse the repository at this point in the history
Change-Id: Ia7875ffc196e4c9121c1be51626a2ae92075d215
Signed-off-by: Troy Ronda <troy@troyronda.com>
  • Loading branch information
troyronda committed Jan 4, 2019
1 parent cb6e8f9 commit f53e21b
Show file tree
Hide file tree
Showing 3 changed files with 468 additions and 13 deletions.
6 changes: 4 additions & 2 deletions Makefile
Expand Up @@ -31,8 +31,10 @@ FABRIC_STABLE_VERSION_MINOR := 1.3
FABRIC_STABLE_VERSION_MAJOR := 1
FABRIC_BASEIMAGE_STABLE_VERSION := 0.4.13

FABRIC_PRERELEASE_VERSION :=
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_DEVSTABLE_VERSION_MAJOR := 1
FABRIC_PREV_VERSION_MINOR := 1.2
Expand Down Expand Up @@ -98,7 +100,7 @@ FABRIC_CODELEVEL_TAG ?= $(FABRIC_STABLE_CODELEVEL_TAG)
# Code level version targets
FABRIC_STABLE_CODELEVEL_VER := v$(FABRIC_STABLE_VERSION_MINOR)
FABRIC_PREV_CODELEVEL_VER := v$(FABRIC_PREV_VERSION_MINOR)
FABRIC_PRERELEASE_CODELEVEL_VER := v$(FABRIC_PRERELEASE_VERSION)
FABRIC_PRERELEASE_CODELEVEL_VER := v$(FABRIC_PRERELEASE_VERSION_MINOR)
FABRIC_DEVSTABLE_CODELEVEL_VER := v$(FABRIC_DEVSTABLE_VERSION_MINOR)
FABRIC_CODELEVEL_VER ?= $(FABRIC_STABLE_CODELEVEL_VER)
FABRIC_CRYPTOCONFIG_VER ?= v$(FABRIC_STABLE_VERSION_MAJOR)
Expand Down
16 changes: 5 additions & 11 deletions test/fixtures/dockerenv/prerelease-env.sh
Expand Up @@ -7,16 +7,10 @@

# This file contains environment overrides to enable testing
# against the latest pre-release target.
export FABRIC_FIXTURE_VERSION="v1.3"
export FABRIC_FIXTURE_VERSION="v1.4"
export FABRIC_CRYPTOCONFIG_VERSION="v1"

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"
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_SDK_CLIENT_PEERS_PEER0_ORG1_EXAMPLE_COM_TLSCACERTS_PATH='${GOPATH}'"/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabric/${FABRIC_CRYPTOCONFIG_VERSION}/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem"
export FABRIC_SDK_CLIENT_PEERS_PEER0_ORG2_EXAMPLE_COM_TLSCACERTS_PATH='${GOPATH}'"/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabric/${FABRIC_CRYPTOCONFIG_VERSION}/crypto-config/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem"
export FABRIC_CA_FIXTURE_TAG="1.4.0-rc2"
export FABRIC_ORDERER_FIXTURE_TAG="1.4.0-rc2"
export FABRIC_PEER_FIXTURE_TAG="1.4.0-rc2"
export FABRIC_BUILDER_FIXTURE_TAG="1.4.0-rc2"

0 comments on commit f53e21b

Please sign in to comment.