Skip to content

Commit

Permalink
Upgrade system tests to Fabric 1.0.3 (hyperledger-archives#2490)
Browse files Browse the repository at this point in the history
Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
  • Loading branch information
Dave Kelsey authored and Simon Stone committed Oct 27, 2017
1 parent 6a844db commit 7808f4d
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
14 changes: 7 additions & 7 deletions packages/composer-systests/hlfv1/docker-compose.tls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2'

services:
ca.org1.example.com:
image: hyperledger/fabric-ca:$ARCH-1.0.1
image: hyperledger/fabric-ca:$ARCH-1.0.3
environment:
- FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
- FABRIC_CA_SERVER_CA_NAME=ca.org1.example.com
Expand All @@ -18,7 +18,7 @@ services:
container_name: ca.org1.example.com

ca.org2.example.com:
image: hyperledger/fabric-ca:$ARCH-1.0.1
image: hyperledger/fabric-ca:$ARCH-1.0.3
environment:
- FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
- FABRIC_CA_SERVER_CA_NAME=ca.org2.example.com
Expand All @@ -35,7 +35,7 @@ services:

orderer.example.com:
container_name: orderer.example.com
image: hyperledger/fabric-orderer:$ARCH-1.0.1
image: hyperledger/fabric-orderer:$ARCH-1.0.3
environment:
- ORDERER_GENERAL_LOGLEVEL=debug
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
Expand All @@ -57,7 +57,7 @@ services:

peer0.org1.example.com:
container_name: peer0.org1.example.com
image: hyperledger/fabric-peer:$ARCH-1.0.1
image: hyperledger/fabric-peer:$ARCH-1.0.3
environment:
- CORE_LOGGING_PEER=debug
- CORE_CHAINCODE_LOGGING_LEVEL=DEBUG
Expand Down Expand Up @@ -91,15 +91,15 @@ services:

couchdb.org1.example.com:
container_name: couchdb.org1.example.com
image: hyperledger/fabric-couchdb:$ARCH-1.0.1
image: hyperledger/fabric-couchdb:$ARCH-1.0.3
ports:
- 5984:5984
environment:
DB_URL: http://localhost:5984/member_db

peer0.org2.example.com:
container_name: peer0.org2.example.com
image: hyperledger/fabric-peer:$ARCH-1.0.1
image: hyperledger/fabric-peer:$ARCH-1.0.3
environment:
- CORE_LOGGING_PEER=debug
- CORE_CHAINCODE_LOGGING_LEVEL=DEBUG
Expand Down Expand Up @@ -133,7 +133,7 @@ services:

couchdb.org2.example.com:
container_name: couchdb.org2.example.com
image: hyperledger/fabric-couchdb:$ARCH-1.0.1
image: hyperledger/fabric-couchdb:$ARCH-1.0.3
ports:
- 6984:5984
environment:
Expand Down
14 changes: 7 additions & 7 deletions packages/composer-systests/hlfv1/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2'

services:
ca.org1.example.com:
image: hyperledger/fabric-ca:$ARCH-1.0.1
image: hyperledger/fabric-ca:$ARCH-1.0.3
environment:
- FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
- FABRIC_CA_SERVER_CA_NAME=ca.org1.example.com
Expand All @@ -14,7 +14,7 @@ services:
container_name: ca.org1.example.com

ca.org2.example.com:
image: hyperledger/fabric-ca:$ARCH-1.0.1
image: hyperledger/fabric-ca:$ARCH-1.0.3
environment:
- FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
- FABRIC_CA_SERVER_CA_NAME=ca.org2.example.com
Expand All @@ -27,7 +27,7 @@ services:

orderer.example.com:
container_name: orderer.example.com
image: hyperledger/fabric-orderer:$ARCH-1.0.1
image: hyperledger/fabric-orderer:$ARCH-1.0.3
environment:
- ORDERER_GENERAL_LOGLEVEL=debug
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
Expand All @@ -45,7 +45,7 @@ services:

peer0.org1.example.com:
container_name: peer0.org1.example.com
image: hyperledger/fabric-peer:$ARCH-1.0.1
image: hyperledger/fabric-peer:$ARCH-1.0.3
environment:
- CORE_LOGGING_PEER=debug
- CORE_CHAINCODE_LOGGING_LEVEL=DEBUG
Expand Down Expand Up @@ -74,15 +74,15 @@ services:

couchdb.org1.example.com:
container_name: couchdb.org1.example.com
image: hyperledger/fabric-couchdb:$ARCH-1.0.1
image: hyperledger/fabric-couchdb:$ARCH-1.0.3
ports:
- 5984:5984
environment:
DB_URL: http://localhost:5984/member_db

peer0.org2.example.com:
container_name: peer0.org2.example.com
image: hyperledger/fabric-peer:$ARCH-1.0.1
image: hyperledger/fabric-peer:$ARCH-1.0.3
environment:
- CORE_LOGGING_PEER=debug
- CORE_CHAINCODE_LOGGING_LEVEL=DEBUG
Expand Down Expand Up @@ -111,7 +111,7 @@ services:

couchdb.org2.example.com:
container_name: couchdb.org2.example.com
image: hyperledger/fabric-couchdb:$ARCH-1.0.1
image: hyperledger/fabric-couchdb:$ARCH-1.0.3
ports:
- 6984:5984
environment:
Expand Down
10 changes: 5 additions & 5 deletions packages/composer-systests/scripts/run-system-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ for SYSTEST in $(echo ${SYSTEST} | tr "," " "); do
else
DOCKER_FILE=${DIR}/hlfv1/docker-compose.yml
fi
docker pull hyperledger/fabric-peer:$ARCH-1.0.1
docker pull hyperledger/fabric-ca:$ARCH-1.0.1
docker pull hyperledger/fabric-ccenv:$ARCH-1.0.1
docker pull hyperledger/fabric-orderer:$ARCH-1.0.1
docker pull hyperledger/fabric-couchdb:$ARCH-1.0.1
docker pull hyperledger/fabric-peer:$ARCH-1.0.3
docker pull hyperledger/fabric-ca:$ARCH-1.0.3
docker pull hyperledger/fabric-ccenv:$ARCH-1.0.3
docker pull hyperledger/fabric-orderer:$ARCH-1.0.3
docker pull hyperledger/fabric-couchdb:$ARCH-1.0.3
if [ -d ./hlfv1/crypto-config ]; then
rm -rf ./hlfv1/crypto-config
fi
Expand Down

0 comments on commit 7808f4d

Please sign in to comment.