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

Commit c82f744

Browse files
committed
[FAB-6428] Update CI & tools to Fabric 1.0.3
Change-Id: Idc8856bc5c6e00fa2df24034b2b6809a707381da Signed-off-by: Troy Ronda <troy@troyronda.com>
1 parent 171e0c6 commit c82f744

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ FABRIC_SDK_EXTRA_GO_TAGS ?=
3434
FABRIC_SDK_POPULATE_VENDOR ?= true
3535

3636
# Fabric tool versions (overridable)
37-
FABRIC_TOOLS_VERSION ?= 1.0.1
38-
FABRIC_BASE_VERSION ?= 0.3.1
37+
FABRIC_TOOLS_VERSION ?= 1.0.3
38+
FABRIC_BASE_VERSION ?= 0.4.2
3939

4040
# Fabric base docker image (overridable)
4141
FABRIC_BASE_IMAGE ?= hyperledger/fabric-baseimage

test/fixtures/.env

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
# Default architecture
1212
ARCH=x86_64
1313

14-
FABRIC_CA_FIXTURE_TAG=1.0.1
15-
FABRIC_ORDERER_FIXTURE_TAG=1.0.1
16-
FABRIC_PEER_FIXTURE_TAG=1.0.1
17-
FABRIC_COUCHDB_FIXTURE_TAG=1.0.1
18-
FABRIC_BUILDER_FIXTURE_TAG=1.0.1
19-
FABRIC_BASEOS_FIXTURE_TAG=0.3.1
14+
FABRIC_CA_FIXTURE_TAG=1.0.3
15+
FABRIC_ORDERER_FIXTURE_TAG=1.0.3
16+
FABRIC_PEER_FIXTURE_TAG=1.0.3
17+
FABRIC_COUCHDB_FIXTURE_TAG=1.0.3
18+
FABRIC_BUILDER_FIXTURE_TAG=1.0.3
19+
FABRIC_BASEOS_FIXTURE_TAG=0.4.2
2020

2121
FABRIC_CA_FIXTURE_IMAGE=hyperledger/fabric-ca
2222
FABRIC_ORDERER_FIXTURE_IMAGE=hyperledger/fabric-orderer

test/scripts/fabric_test_commitlevel.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
# If set to false, CI will build images from scratch for the commit levels specified below
1010
export USE_PREBUILT_IMAGES=true
1111

12-
#file used for automatic integration build test
13-
#This should always match the compatibility specified in the README.md
14-
export FABRIC_COMMIT=v1.0.1
15-
export FABRIC_CA_COMMIT=v1.0.1
12+
# versions of fabric to build (if USE_PREBUILT_IMAGES=false)
13+
export FABRIC_COMMIT=
14+
export FABRIC_CA_COMMIT=

0 commit comments

Comments
 (0)