Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit f53e21b

Browse files
committed
[FABG-804] Update prerelease target to 1.4 RC2
Change-Id: Ia7875ffc196e4c9121c1be51626a2ae92075d215 Signed-off-by: Troy Ronda <troy@troyronda.com>
1 parent cb6e8f9 commit f53e21b

File tree

3 files changed

+468
-13
lines changed

3 files changed

+468
-13
lines changed

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ FABRIC_STABLE_VERSION_MINOR := 1.3
3131
FABRIC_STABLE_VERSION_MAJOR := 1
3232
FABRIC_BASEIMAGE_STABLE_VERSION := 0.4.13
3333

34-
FABRIC_PRERELEASE_VERSION :=
34+
FABRIC_PRERELEASE_VERSION := 1.4.0-rc2
35+
FABRIC_PRERELEASE_VERSION_MINOR := 1.4
3536
FABRIC_PREV_VERSION := 1.2.1
37+
FABRIC_PREV_VERSION_MINOR := 1.2
3638
FABRIC_DEVSTABLE_VERSION_MINOR := 1.3
3739
FABRIC_DEVSTABLE_VERSION_MAJOR := 1
3840
FABRIC_PREV_VERSION_MINOR := 1.2
@@ -98,7 +100,7 @@ FABRIC_CODELEVEL_TAG ?= $(FABRIC_STABLE_CODELEVEL_TAG)
98100
# Code level version targets
99101
FABRIC_STABLE_CODELEVEL_VER := v$(FABRIC_STABLE_VERSION_MINOR)
100102
FABRIC_PREV_CODELEVEL_VER := v$(FABRIC_PREV_VERSION_MINOR)
101-
FABRIC_PRERELEASE_CODELEVEL_VER := v$(FABRIC_PRERELEASE_VERSION)
103+
FABRIC_PRERELEASE_CODELEVEL_VER := v$(FABRIC_PRERELEASE_VERSION_MINOR)
102104
FABRIC_DEVSTABLE_CODELEVEL_VER := v$(FABRIC_DEVSTABLE_VERSION_MINOR)
103105
FABRIC_CODELEVEL_VER ?= $(FABRIC_STABLE_CODELEVEL_VER)
104106
FABRIC_CRYPTOCONFIG_VER ?= v$(FABRIC_STABLE_VERSION_MAJOR)

test/fixtures/dockerenv/prerelease-env.sh

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,10 @@
77

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

13-
export FABRIC_CA_FIXTURE_TAG="1.3.0-rc1"
14-
export FABRIC_ORDERER_FIXTURE_TAG="1.3.0-rc1"
15-
export FABRIC_PEER_FIXTURE_TAG="1.3.0-rc1"
16-
export FABRIC_BUILDER_FIXTURE_TAG="1.3.0-rc1"
17-
18-
# override SDK configuration that loads crypto-config
19-
export FABRIC_SDK_CLIENT_CRYPTOCONFIG_PATH='${GOPATH}'"/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabric/${FABRIC_CRYPTOCONFIG_VERSION}/crypto-config"
20-
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"
21-
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"
22-
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"
13+
export FABRIC_CA_FIXTURE_TAG="1.4.0-rc2"
14+
export FABRIC_ORDERER_FIXTURE_TAG="1.4.0-rc2"
15+
export FABRIC_PEER_FIXTURE_TAG="1.4.0-rc2"
16+
export FABRIC_BUILDER_FIXTURE_TAG="1.4.0-rc2"

0 commit comments

Comments
 (0)