Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e-network/docker/test-02-v2-raft-2orgs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ waitForContainer "peer1.org1.example.com" "Membership view has changed. peers we
waitForContainer "db.explorer.example.com" "database system is ready to accept connections" "200"
# // the next check is not working because explorer needs needs to be restarted first
# // see the issue: https://github.com/hyperledger-labs/fablo/issues/604
# waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"
waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"

# check if org2 is ready
waitForContainer "ca.org2.example.com" "Listening on https://0.0.0.0:7054"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1663,6 +1663,8 @@ installChannels() {
printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B"
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoin 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"

# Restart Explorer
printItalics "Restarting Explorer" "U1F504"
}

installChaincodes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1734,6 +1734,9 @@ installChannels() {

printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"

# Restart Explorer
printItalics "Restarting Explorer" "U1F504"
}

installChaincodes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1786,6 +1786,8 @@ installChannels() {
printHeadline "Creating 'my-channel2' on Org1/peer0" "U1F63B"
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel2' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"

# Restart Explorer
printItalics "Restarting Explorer" "U1F504"
}

installChaincodes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2471,6 +2471,9 @@ installChannels() {
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
printItalics "Joining 'my-channel1' on Org2/peer0" "U1F638"
docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org2MSP' 'peer0.org2.example.com:7061' 'crypto/users/Admin@org2.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"

# Restart Explorer
printItalics "Restarting Explorer" "U1F504"
}

installChaincodes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4038,6 +4038,11 @@ installChannels() {
docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer0.org2.example.com:7081' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer2.com-cert.pem' 'orderer0.group2.orderer2.com:7050';"
printItalics "Joining 'my-channel3' on Org2/peer1" "U1F638"
docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer1.org2.example.com:7082' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer2.com-cert.pem' 'orderer0.group2.orderer2.com:7050';"

# Restart Explorer
printItalics "Restarting Explorer" "U1F504"
echo "Restarting global Explorer: explorer.example.com"
docker restart explorer.example.com || true
}

installChaincodes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4474,6 +4474,11 @@ installChannels() {
docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer0.org2.example.com:7061' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"
printItalics "Joining 'my-channel3' on Org2/peer1" "U1F638"
docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer1.org2.example.com:7062' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"

# Restart Explorer
printItalics "Restarting Explorer" "U1F504"
echo "Restarting global Explorer: explorer.example.com"
docker restart explorer.example.com || true
}

installChaincodes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1947,6 +1947,9 @@ installChannels() {

printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"

# Restart Explorer
printItalics "Restarting Explorer" "U1F504"
}

installChaincodes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1971,6 +1971,9 @@ installChannels() {

printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"

# Restart Explorer
printItalics "Restarting Explorer" "U1F504"
}

installChaincodes() {
Expand Down
Loading
Loading