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>
(cherry picked from commit 0c4141f2a1)
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: Ib2fd948eae9f2e37535144489279773836400358
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.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>
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>
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>
(cherry picked from commit f942010fa6)
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>
byfn test failing intermittently in CI due to peer not
being available when the join channel command is
executed. Need to wait for peer to finsih establishing
connection with couchdb before joining channel.
The exit code was not being correctly captured from the
peer join command and thus the retry logic was not being
executed.
Change-Id: I2c27d17cd769c6b8de1bdcfed263d9b0f758b432
Signed-off-by: Saad Karim <skarim@us.ibm.com>
The first-network CLI yaml was recently enhanced to use volume mounts
for the ledger directories. There is the additional e2e yaml which
depends on the container definitions and is now failing. This CR simply
edits its template to include these new volume definitions.
Change-Id: Ia5b7b93b2be4f9de1f0ebfaa804f8ef713fb935d
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
Docker compose makes volume management easy and transparent to the user.
By defaulting the ledgers to be docker compose volumes, we transparently
get ledger persistence for the ugprade case, and may trivially tear the
volumes down in the docker-compose down command with the addition of the
--volumes flag. This would allow the upgrade scenario to work without
the use of the '-p' flag, and is likely to be generally much cleaner.
Change-Id: I80b36a63370065a7aad0f9c284ec578533123d2b
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
replace DEBUG level logging w/INFO, but add in
shell debug statements for all fabric commands
for improved UX
Change-Id: I97a19db0373ecaf7a504cb95d4815a11cd64dfed
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
As of 1.1 alpha timeframe, 3rd party images do not follow the
same docker IMAGE_TAG versioning as the other Fabric docker images.
Need to remove IMAGE_TAG from couchdb images, and default to
latest couchdb image, which is how it worked prior to
the -i introduction.
This change needs to be made in master branch but not release branch,
since the IMAGE_TAGs are aligned in 1.0.x release.
Change-Id: Iaca24ea7ed1fc6319738dcf59f665da9259d2b9a
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
Adding upgrade functionality to byfn.sh to upgrade the fabric network
from v1.0.x to v1.1 and scripts for cli to enable
/Channel, /Channel/Orderer, /Channel/Application capabilities
Usage:
git fetch origin
git checkout origin/release
./byfn.sh -m up -i 1.0.6
git checkout origin/master
./byfn.sh upgrade
Change-Id: I6f53a6db39501e2653dc4c325d3d42d78f463e87
Signed-off-by: Surya <suryalnvs@gmail.com>
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
This CR adds a new docker-compose-persist.yaml file which creates a
volume mount in the current directory at ./ledgers/<container> and binds
it to the ledger directory for the container.
It also adds a '-p' flag to the byfn.sh script to allow users to include
this new compose file when bringing up the network.
Change-Id: I1ee5faa33c7f0ce18fe7711f5f752d7bf18f117c
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
Signed-off-by: Surya <suryalnvs@gmail.com>
The first-network tutorial turns on the v1.1 fabric capabilities, and
depends on very recent versions of cryptogen and configtxlator. Users
appear to be running the latest version of first-network with older
binaries, and are experiencing cryptic failures.
This CR adds basic version checking, both for the local binary versions
as well as the binary versions contained within the docker images. If
these versions are mismatched, it prints a warning. If either of the
versions is in a black-list, the byfn.sh will error out.
Change-Id: I1a43ec396c8d1f5a438472cb422d5a7e52e2ef63
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
