Skip to content

Commit

Permalink
[FAB-6428] Update CI & tools to Fabric 1.0.3
Browse files Browse the repository at this point in the history
Change-Id: Idc8856bc5c6e00fa2df24034b2b6809a707381da
Signed-off-by: Troy Ronda <troy@troyronda.com>
  • Loading branch information
troyronda committed Oct 4, 2017
1 parent 171e0c6 commit c82f744
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ FABRIC_SDK_EXTRA_GO_TAGS ?=
FABRIC_SDK_POPULATE_VENDOR ?= true

# Fabric tool versions (overridable)
FABRIC_TOOLS_VERSION ?= 1.0.1
FABRIC_BASE_VERSION ?= 0.3.1
FABRIC_TOOLS_VERSION ?= 1.0.3
FABRIC_BASE_VERSION ?= 0.4.2

# Fabric base docker image (overridable)
FABRIC_BASE_IMAGE ?= hyperledger/fabric-baseimage
Expand Down
12 changes: 6 additions & 6 deletions test/fixtures/.env
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
# Default architecture
ARCH=x86_64

FABRIC_CA_FIXTURE_TAG=1.0.1
FABRIC_ORDERER_FIXTURE_TAG=1.0.1
FABRIC_PEER_FIXTURE_TAG=1.0.1
FABRIC_COUCHDB_FIXTURE_TAG=1.0.1
FABRIC_BUILDER_FIXTURE_TAG=1.0.1
FABRIC_BASEOS_FIXTURE_TAG=0.3.1
FABRIC_CA_FIXTURE_TAG=1.0.3
FABRIC_ORDERER_FIXTURE_TAG=1.0.3
FABRIC_PEER_FIXTURE_TAG=1.0.3
FABRIC_COUCHDB_FIXTURE_TAG=1.0.3
FABRIC_BUILDER_FIXTURE_TAG=1.0.3
FABRIC_BASEOS_FIXTURE_TAG=0.4.2

FABRIC_CA_FIXTURE_IMAGE=hyperledger/fabric-ca
FABRIC_ORDERER_FIXTURE_IMAGE=hyperledger/fabric-orderer
Expand Down
7 changes: 3 additions & 4 deletions test/scripts/fabric_test_commitlevel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
# If set to false, CI will build images from scratch for the commit levels specified below
export USE_PREBUILT_IMAGES=true

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

0 comments on commit c82f744

Please sign in to comment.