Commit graph

200 commits

Author SHA1 Message Date
Jonathan Blood
595fed4408 [FAB-12073] Fix Org3 peers CouchDB config.
Change-Id: I279a32b3a07a326fc0291f259f66b4f3a036a58a
Signed-off-by: Jonathan Blood <jonathan.blood@uk.ibm.com>
(cherry picked from commit 3237229184)
2018-09-25 13:19:21 +00:00
David Enyeart
e5257214ba [FAB-12022] Fix CI by increasing couchdb timeout
Increase retry timeout from 3s to 15s so that initial CLI
commands after peers and couchdb come up are successful.

Change-Id: Ib5f879bde52395d9f600683da17bf03aff6e05b2
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
(cherry picked from commit 9c6aceed38)
2018-09-25 02:25:36 +00:00
rameshthoomu
ea857e0639 FAB-11488 Update CI script
Update byfn_eyfn.sh script to fetch the binaries from the correct
 nexus url.

Change-Id: I3ce15b5c39dd2253a41e545defc2be98874494aa
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-08-17 09:13:00 +00:00
Bret Harrison
4c2ac0dbf3 [FAB-11220] Samples - remove EventHub
Removed the use of the old EventHub from both
FabCar and BalanceTransfer.

Meanwhile, speficify the tag of fabric-client, fabric-ca-client
to be 1.2

Change-Id: Ia4a0bb443f95c462efde9b054058986ae8bd80fd
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
Signed-off-by: davidliu <david-khala@hotmail.com>
2018-08-11 09:11:23 +08:00
David Enyeart
046250b9e3 [FAB-11515] Pin fabric samples to node.js ~1.2.0
Pin fabric samples to node.js ~1.2.0 sdk and chaincode shim,
so that the v1.2 samples always use v1.2.x sdk and shim.

Change-Id: I5e2d4a37dc84f7f0f99bf82744843ee719b83fce
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-08-08 12:29:39 +00:00
Christopher Ferris
2610e5277b Fix version of fabric-client
FAB-11501 #done
the version of fabric-client and fabric-ca-client
needs to be one of the 1.2.x releases

Change-Id: Ib0d765741cbff20ae781d6a09ee3e73acd6aabd3
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2018-08-08 09:11:27 +00:00
Kostas Christidis
520b1aa536 Merge "FAB-9297 fix README links and update bootstrap.sh" into release-1.2 2018-07-27 14:39:53 +00:00
rameshthoomu
3776158e5f FAB-11312 Update fabric image version
Update fabric image version to 1.2.1-stable to pull the latest
fabric and fabric-ca docker images

Change-Id: I282b5ed177bad34579d149fa832f178aef64c775
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-07-25 15:41:17 -04:00
Christopher Ferris
5d70aa563b FAB-9297 fix README links and update bootstrap.sh
FAb-9297 #done

Change-Id: I00cac1a0c01a777af887104064e7dfa775359359
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2018-07-24 19:05:20 +00:00
Keith Smith
ed81d7b9b1 [FAB-10811] fabric-ca sample is broken on v1.2
The Profile section of configtx.yaml must now be at the end of the file,
so the building of this file dynamically must be updated.
I also updated the version of the fabric CA in bootstrap.sh to 1.2.0.

Change-Id: Ifabccebc901f74569cfa1fe1d824fbcd26c4ffd1
Signed-off-by: Keith Smith <bksmith@us.ibm.com>
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
(cherry picked from commit 75e293183b)
2018-06-22 15:21:26 +00:00
Naga Pemmara
ad40e29ebb [FAB-10732] BYFN upgrade to v1.2
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>
2018-06-21 16:11:41 -04:00
Naga Pemmara
20ad472356 FAB-10801 format and styling for shell artifacts
formatting for existing shell scripts

Change-Id: I7e067730558bc55edc74b73e59195af7c825d8b2
Signed-off-by: Naga Pemmara <naga.pemmaraju@ibm.com>
2018-06-21 15:25:27 -04:00
rameshthoomu
e95210e9bc FAB-10074 CI Script for pipeline project type
This patch supports Jenkins CI pipeline project type for master branch.

Script will pull docker images (1.2.0-stable) and binaries from Nexus
and run byfn and eyfn tests. The pipeline script supports only master
branch and release branches supports regular freestyle flow.

Change-Id: I85938f66b588b2e37a2a12d4941672632d52c8dd
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-06-11 12:36:12 -04:00
Artem Barger
f65f493b98 Merge "[FAB-6600] Sample chaincode for private data" 2018-06-03 21:08:16 +00:00
David Enyeart
5956178406 [FAB-6600] Sample chaincode for private data
Marbles02 chaincode updated to utilize private
data collections on all ledger APIs.

To run the sample, follow the instructions
in FAB-10231. An official tutorial will follow.

Change-Id: Id9b3dbae8ab62afe81ee8d116b7bd4efc0213933
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-06-02 07:42:09 -04:00
Christopher Ferris
8c85450788 Merge "[FAB-10340] Fix broken link in chaincode-docker-devmode" 2018-05-28 19:36:48 +00:00
Christopher Ferris
21444abf4c FAB-10297 replace fabric-preload.sh
replace fabric-preload.sh w/ bootstrap.sh

Change-Id: Id4b04b0835e7a03e051110aab96c62d5e6d1221c
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2018-05-25 18:17:08 +00:00
yacovm
3c32c524e5 [FAB-10346] Ensure peers are in sync in eyfn
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>
2018-05-23 22:35:09 +00:00
Yuki Kondo
2f30504769 [FAB-10340] Fix broken link in chaincode-docker-devmode
This CR fixes broken links to the install manual
in fabric-samples/chaincode-docker-devmode/README.rst.
The style is also updated to follow the style of rst.

Change-Id: I9bbb6e0b88b8aabf8e020bb81756f4619115989c
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2018-05-23 19:02:18 +00:00
Taku Shimosawa
a603655419 [FAB-10306] Fix config in balance-transfer
This patchset removes wrong max message size configuration from
network-config.yaml in the balance-transfer sample.
After [FAB-9337] was merged, this configuration was activated and caused
an error in running the sample.

Change-Id: I209448bd7701d5843b7ac06501be6a9d16d378e1
Signed-off-by: Taku Shimosawa <taku.shimosawa@hal.hitachi.com>
2018-05-22 17:51:30 -07:00
Gari Singh
1bfdee8ca3 Merge "FAB-8612 Cleanup eyfn/byfn with --remove-orphans" 2018-05-22 16:47:19 +00:00
Gari Singh
76008b274d Merge "[FAB-10235] Update BYFN to use V1_2 capability" 2018-05-22 16:47:00 +00:00
Gari Singh
509d84da3c Merge "[FAB-7584] Removes copy of creds to keystore" 2018-05-22 12:19:16 +00:00
Gari Singh
9eb7ff6f19 Merge "[FAB-10021] Typo in balance-transfer/testAPIs.sh" 2018-05-22 12:18:38 +00:00
Christopher Ferris
cf1d46ae06 Merge "[FAB-10073] Fix broken link in samples/fabric-ca/README" 2018-05-22 10:36:05 +00:00
Jason Yellick
1cd059e534 FAB-8612 Cleanup eyfn/byfn with --remove-orphans
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>
2018-05-21 16:46:17 -04:00
David Enyeart
3031a8c556 [FAB-10235] Update BYFN to use V1_2 capability
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>
2018-05-20 21:27:46 -04:00
Matthew Sykes
5cf19449f1 [FAB-10185] Reorder for logical consistency
Change-Id: I0274250c8c0c5d1801b6db0fb7bfce3359bb1c2f
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
2018-05-17 11:06:09 -04:00
Matthew Sykes
e2f4f20bd6 [FAB-10176] Fix invalid configtx.yaml documents
Change-Id: Ibf52f9380ed3b724c594b53550321a12475e9860
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
2018-05-17 08:41:05 -04:00
Yuki Kondo
cad2b98044 [FAB-10073] Fix broken link in samples/fabric-ca/README
This CR fixes the broken link to the document of ABAC
in fabric-samples/fabric-ca/README.md.

Change-Id: I2aff8a2c6b1f3e208f211f20f9237d8c3efd14d8
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2018-05-15 17:37:26 +00:00
weikeng
ace2e5ab91 [FAB-10021] Typo in balance-transfer/testAPIs.sh
There is a typo for transaction in testAPIs.sh

Change-Id: I0f8ca7b2a9003b5f85ba980cab5eff80853b03dc
Signed-off-by: weikeng <w.k@berkeley.edu>
2018-05-12 08:14:51 -07:00
Gari Singh
c3979b5716 Merge "[FAB-8265] Fixed spelling error in registerUser" 2018-05-11 08:34:20 +00:00
Gari Singh
14cfb00ce7 Merge "FAB-9552 Fix access of an un-declared variable" 2018-05-11 08:31:47 +00:00
David Enyeart
d71e6df693 Merge "[FAB-9572] Fix README to match new version of BYFN" 2018-05-07 10:12:46 +00:00
Robert P. J. Day
fa1d8997af [FAB-9893] Add .gitreview file for quicker Gerrit setup
Change-Id: I48e870e2e2b487209ba894dfd4293d3c1dbece1b
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
2018-05-04 11:46:33 -04:00
Keith Smith
7458dc6da7 Merge "[ FAB-8730 ] hyphen breaks fabric-samples" 2018-05-04 13:58:32 +00:00
Qiang Yiting
98561e0919 FAB-9552 Fix access of an un-declared variable
Change-Id: Ia518b5733e69a999a304d251390999fa1291b4eb
Signed-off-by: Qiang Yiting <suntoe@189.cn>
2018-05-03 20:24:14 +00:00
Will Lahti
b5dad8cd25 [FAB-9317] Update first-network with multi endorse
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>
2018-05-03 09:52:22 -04:00
Arnaud J Le Hors
146f7bc193 [FAB-9572] Fix README to match new version of BYFN
Changed README.md to instruct user to edit byfn.sh instead
of docker-compose-cli file since this is where the standard
BFYN script is now run.
Also added missing Copyright notices.

Change-Id: Ib18afe8a23cc3874729031a82480aac5b0a2b555
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2018-04-24 18:27:10 +02:00
Robert P. J. Day
010fcb544f [FAB-9326] Clean up byfn.sh, drop "-m" option
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>
2018-04-23 08:10:07 -04:00
Artem Barger
54b071bfdc Merge "FAB-9294 eliminate excess noise in BYFN" 2018-04-21 20:18:47 +00:00
Yacov Manevich
820551d6c8 Merge "[FAB-9475] Fix a dead link in README" 2018-04-18 07:22:55 +00:00
nirro
2d6386c421 [FAB-8245] change first network according to the fix
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>
2018-04-17 15:47:45 +03:00
Nao Nishijima
3a5108f020 [FAB-9475] Fix a dead link in README
There is no "samples.html" in latest documents.
This patch changes the dead link to "install.html"

Change-Id: I431d197c5f4124a979d706f668da28ad1d14b235
Signed-off-by: Nao Nishijima <nao.nishijima@hal.hitachi.com>
2018-04-11 13:19:32 -07:00
Christopher Ferris
77a65685c5 FAB-9294 eliminate excess noise in BYFN
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>
2018-04-08 19:14:20 -04:00
foolcage
41f5ab839b [FAB-9406] Typo in byfn.sh
I found "depete" in first-network/byfn.sh.
Maybe it should be "delete".

Change-Id: Iecdb6f8822b8b99765bc9d93e9b5ab623cb63607
Signed-off-by: foolcage <5533061@qq.com>
2018-04-08 18:03:01 +08:00
Gari Singh
88bfe50fce Merge "FAB-9362 add CONTRIBUTING.md and CODE_OF_CONDUCT.md" 2018-04-06 20:50:22 +00:00
Gari Singh
c8d8b91749 Merge "[FAB-8958] Add org3 removal to byfn.sh" 2018-04-06 13:14:38 +00:00
Christopher Ferris
f5c2eb8ee9 FAB-9362 add CONTRIBUTING.md and CODE_OF_CONDUCT.md
Change-Id: I01f2039d9835e6ccccce17c2b719115e8a6f7c1e
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2018-04-04 19:25:55 -04:00
Robert P. J. Day
9d518fb795 [FAB-9330] Refactor top-level .gitignore into subdirs
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>
2018-04-04 06:26:20 -04:00