This CR removes the unused variable 'OS_ARCH' from byfn.sh,
eyfn.sh and interest swap in fabric-samples.
FAB-9329 #done
Change-Id: I0d1b87679d66bec1d9e4aaee9e770305f9c8f4b9
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
BYFN and Fabcar with couchdb are failing intermittently
because CLI sends a request for joining a Channel before
a Peer connects to the couchdb.
This CR changes the value of MAX_RETRY from 10 to 15
as a workaround.
FAB-15601 #done
Change-Id: I8d91fa224c585cc52c9dfabebb808b8909253900
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
Add a new "-n" option to byfn.sh that optionally skips
the deployment of the abstore chaincode. When BYFN is
used as a network for other samples, we don't really
want the default chaincode deployed.
Change-Id: I6b4043a5c0bcedbeec431cc4a860a3b12da8d8f6
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Add a new "-a" option to byfn.sh that optionally deploys
certificate authorities (in Docker containers) for
organisation 1 and 2.
Change-Id: Ib58c46941aa6e8e58bac01aa3349e97d1f93b930
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Add connection profiles as part of the BYFN and EYFN
samples. The connection profiles can be used by client
applications using the Fabric SDKs to connect to those
networks.
Each organisation needs its own connection profile
that contains the set of peers that organisation
should use to connect to the network. Orderers and
channels are not needed, as they can be determined
by using service discovery.
Connection profiles can be specified in either JSON
or YAML, so provide both.
Change-Id: Ie8e3d2aef6475b324e5be8ebdada4c594c2235ae
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
This patch updates CI pipeline scripts which utilizes global shared
library reusable functions. It also creates ci.properties file with
all the parameters required to test the fabric-samples patch.
Change-Id: I9ed97c8dd0c07a3677042dbda034043e8a19a0f1
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
Between the approve and commit steps we add a QueryApprovalStatus to verify
whether peers are ready to commit the chaincode definition.
Change-Id: I18805a4180fa61da07d2bca321c6355660f772fc
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>
The tools and fabric images are all alpine based now and do not have
apt-get. Instead, they are prepopulated with jq. This CR simply
removes the attempt to install jq (which always fails) and acts as a
red-herring when trying to debug.
Change-Id: I8fe83dc4a9ba6995ebfb2786cee45fe0e591b85a
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
Extend the 3-node etcd/raft cluster in BYFN to 5 nodes, in
order to better support the documentation effort. This will
allow users to experiment creating channels with less then
5 nodes, but avoid the pitfalls of a 2-node cluster.
Change-Id: I5ba1d6039b4bb4864b2b97271de81fbfe91b4fb5
Signed-off-by: Yoav Tock <tock@il.ibm.com>
Augment the fabric-samples first-network sample to include an option
to choose etcd/raft as consensus-type.
Extend the -o flag so that it allows users to choose between the
solo, kafka, or etcdraft consensus-type for the ordering service.
Use three orderer nodes.
Change-Id: Ibc4c3564220466aef0a87baee4a2d594e5554a62
Signed-off-by: Yoav Tock <tock@il.ibm.com>
Configtxgen was failing to print the org definition for org3 because it
was missing the required policies for the org definition. This caused a
failure in the CI test for adding an org.
Because it will be needed in the future, this CR also adds the new
lifecycle endorsement and general endorsement policies to the
configtx.yamls as well.
Change-Id: Ie53165231cf8afe6377b51a28625797b15ca78ec
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
Update both BYFN and EYFN so that the peer request and
chaincode ports match the externally mapped ports. This
enables applications both inside and outside the Docker
network to use service discovery to interact with these
networks (see the JIRA for more details).
Change-Id: I73c36dfdb269ec4225376fb04b1e7a087363e4cc
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Previously, configtxgen would auto-populate policies if they were
omitted. This presented some problems for specifying partial policy
schemes, like only overriding one policy. Support for omitting policies
was deprecated in v1.3 and has been removed for v2.0.0.
Change-Id: Ie01bf8f05911358a0af144f2fe2df2667c2bf12e
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
Updated chaincode, BYFN, and all other references to example02 to use
the new name ABstore.
Change-Id: I04c177f9de68eb913f4384fd643aa69631143d58
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
Updated compose files and scripts to use the correct mapping.
Change-Id: Iccbe384393c2736c5ba197d70ef6a124588ad588
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
Adding support to upgrade from 1.3.x to 1.4.0 using upgrade_to_v14.sh
and changes to byfn.sh
For this, no v1_4 capabilities need to be enabled other than v1_3
capabilities on channel and application group level
Only upgrading the images from v1.3.x to v.1.4.0 for peer, orderer,
cli, ccenv
Change-Id: I991f96c2deb3c91870ec4654aa8b561f49594248
Signed-off-by: Surya Lanka <suryalnvs@gmail.com>
Augment the fabric-samples first-network sample to include a flag that allows a choice of consensus-type:
solo (default) or kafka.
- Add note on production deployment of kafka
- Remove port mapping for kafka and zookeeper containars
Change-Id: I3204ba44e5974961eb69649b6f5744f52097ce80
Signed-off-by: Yoav Tock <tock@il.ibm.com>
This change is to fix the couchdb timeout errors in byfn
test. This could be an CI environment issue but to fix CI
failures, increasing the MAX_RETRY count to 10
Change-Id: Id16b1846374eb2cb91b4d67fedb38562df90c7d3
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
Changes include upgrade from v1.2.x to v1.3.x.
First, upgrades the network from v1.2.x to v1.3.x and
upgrade_to_v13.sh will run config updates on /Channel level and
/Channel/Application level for v1_3 capabilities.
Add 15 sec's delay to couchdb tests
Change-Id: Ic2a1633842b7dd8a39ee674c5159d67b46122ff4
Signed-off-by: Surya <suryalnvs@gmail.com>
Signed-off-by: RameshBabu <rameshbabu.thoomu@gmail.com>
Added java project sources under chaincode
Added support for "-l java" to byfn.sh
Change-Id: I7038aed9b21ad9bf51bcb58c6b71ceb1f161813f
Signed-off-by: gennady <gennady@il.ibm.com>
This patch set includes changes for demonstrating
byfn network sample upgrade from v1.1 to v1.2
Change-Id: Ib0e5243e7ec280861c13feab0a23dc3566674f4c
Signed-off-by: Naga Pemmara <naga.pemmaraju@ibm.com>
This change set adds querying to peers in all orgs at the end of eyfn
to ensure peers of all orgs are in sync.
Which proves they all validated the transaction and there is no state fork
among peers of different orgs.
Change-Id: I33ed632798a6e01d182e879c66c282fc4af6dbce
Signed-off-by: yacovm <yacovm@il.ibm.com>
There are currently multiple docker-compose downs going on in the
first-network samples. These are in an attempt to catch different
configurations of the same compose network. The flag --remove-orphans
was created to allow tearing down components in a composition even when
there is a mismatch in the compose definition, so this cleans the down
scripts up a bit.
Change-Id: Ied6a06e2ebc21053993e2a6b39b6fbd7fffdfe02
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
Update BYFN to use V1_2 application capability.
Required for private data collections.
Change-Id: I56c74b9fb6cd77864b5c8d13abb066a3d729500b
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
This CR updates the first-network (BYFN and EYFN) to use an
'AND (...)' endorsement policy. It also cleans up some of the
output and fixes the line length of some comments.
Change-Id: I741f41226955ccfcd3eb5369d8ba6eb77e49e89e
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
Some general cleanup of byfn.sh script:
- Given that "-m" is deprecated, remove its normal processing,
but retain (for now) its early recognition so that CI passes.
- Drop reference to "--help", only "-h" is supported.
- Add reference to "upgrade" mode to usage message and comment.
Change-Id: If1d6624c8788ec660abca5d13e7c87aafb13ce59
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
fixed [FAB-8245], and fabric samples have to be changed accordingly.
currently, added support for both output formats.
Change-Id: I0cac063af44556d6a37f17b25abf20134032540f
Signed-off-by: nirro <nirro@il.ibm.com>
eliminate the noise of echoing the environment
variables for each command and add -v option to
enable the noise for debug purposes for byfn.sh
and eyfn.sh in first-network sample
also eliminate noise in fabcar
Change-Id: I46c377360efbab598fd37c0a31b29a119b99173e
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
I found "depete" in first-network/byfn.sh.
Maybe it should be "delete".
Change-Id: Iecdb6f8822b8b99765bc9d93e9b5ab623cb63607
Signed-off-by: foolcage <5533061@qq.com>
Rather than cram most .gitignore content into the top-level .gitignore
file, partition it into lower-level .gitignore files, as is already done
with a couple subdirectories, just to be consistent.
I'm sure these files could be even tidier but this seems sufficient for
a first pass.
Change-Id: I0cc8cb2a9d7fa82c4f6de1aef9f82107c8cc7a6a
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
When running the sample "Adding an Org to a Channel", then upon clean up,
./eyfn.sh -m down script must be run before ./byfn.sh -m down; otherwise,
org3 containers and volumes and containers do not get cleaned properly.
This patch adds the org3 container and volume cleanup to ./byfn.sh so
that a user does not have to worry about the correct execution ordering
of ./eyfn.sh and ./byfn.sh scripts.
Change-Id: Ieac1adc4081d59943286cfe9139a74395986460b
Signed-off-by: Salman Baset <sabaset@us.ibm.com>
