Commit graph

34 commits

Author SHA1 Message Date
Simon Stone
d26e27e0d1 Merge "[FAB-16147] Compilation and Lint Checks" into release-1.4 2019-08-02 09:31:08 +00:00
Matthew B. White
11d6ee14a9 [FAB-16147] Compilation and Lint Checks
Add in makefile to call the compilation and liniting
Only the applications and contracts currently
Testing needs to follow

Change-Id: I5604a71ea025cd01a1f27968122ea119697db7a5
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>
2019-07-31 11:47:17 +01:00
Simon Stone
dc8e60b4e3 [FGJ-4] CI tests for FabCar Java sample
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I2b28c69a2f3ec0e3d87252ef4a585b4a46fddcbd
2019-07-31 09:24:31 +01:00
Simon Stone
9040e28b55 [FAB-15897] Improve FabCar test logging
Collect logs from all existing Docker containers instead
of just limiting it to a predefined (and incorrect) set.

Also clean up the directory structure for the logs, and
remove any networks/volumes after each test run.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Ifcf88baeb9ba4d42f757f7cd23ab2a178ab39b41
2019-07-30 17:55:24 +01:00
Yukihiko
9e0eed19a4 [FAB-15104] Remove scripts/bootstrap.sh
Removed scripts/bootstrap.sh file and updated the README.md
with steps to download bootstrap.sh from Fabric repository.

Remove versions from fabric-samples readme so that
it doesn't need to be maintained for each release.
Also clarify the bootstrap.sh download instructions.

Signed-off-by: Yukihiko <hirayanagi@jp.fujitsu.com>
Change-Id: I50357c702c8b357fedaf8ccd1ec97ef6c4429371
(cherry picked from commit 5be56d3f77)
2019-07-19 19:12:40 +00:00
Simon Stone
8271a472f8 [FAB-14486] Extend BYFN to opt skip chaincode deploy
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>
2019-04-25 14:49:08 +01:00
Simon Stone
3a1d29ce93 [FAB-14485] Extend BYFN to opt inc cert authorities
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)
2019-04-25 13:06:24 +00:00
rameshthoomu
6c0203a9b0 FABCI-284 Update CI Pipeline script
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>
2019-03-29 11:05:06 -04:00
Sambhav Nidamarty
881ba56c8e FAB-13575 Update Jenkins files for release-1.4
Update the Jenkins scripts for the fabric-samples
tests in the release-1.4 branch.

Change-Id: I5f9c3d555898da354ecc62bd355f52e650c9eac1
Signed-off-by: Sambhav Nidamarty <sambhavdutt@gmail.com>
2019-01-10 17:18:48 +00:00
David Enyeart
bb39b6ed09 [FAB-13570] Align fabric-samples with 1.4.0 release
Change-Id: Ic0291f07e2aba519bcd05238d002eecd5ec43891
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2019-01-09 15:36:16 -05:00
Gari Singh
461b6abcd6 FABC-781 Remove fabric-ca sample
This sample  uses images which are no
longer published and are not supported
by the community.

FABC-781 #done

Change-Id: I01865b433a1ef4345aaf47255b92c1f83275aa4f
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2019-01-04 09:38:39 -05:00
Gari Singh
e6ce28c1e8 Merge "FAB-13305 Update scripts to pull latest artifacts" 2019-01-04 14:03:08 +00:00
Sambhav Nidamarty
e3da2208d7 FAB-13433 - Update Jenkinsfile configuration
This change is to update Jenkinsfile to fetch
the patchset for verify jobs and clone the latest
commit for merge jobs.

Change-Id: I20f9a322eb9f60b648b4b630df2d4565223be916
Signed-off-by: Sambhav Nidamarty <sambhavdutt@gmail.com>
2019-01-02 22:54:53 -05:00
David Enyeart
9567985d29 [FAB-13407] Align fabric-samples with 1.4.0-rc2 release
Change-Id: If784ead9b35c89b874078fe3e87e702fd3be5953
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-12-20 17:11:36 -05:00
Sambhav Nidamarty
c7572aad9b FAB-13305 Update scripts to pull latest artifacts
Update byfn/eyfn Jenkins script to get the latest
version binaries for fabric and fabric-ca

Change-Id: I0a310385285b1c086a6cfef0f7cb1c1906ed8351
Signed-off-by: Sambhav Nidamarty <sambhavdutt@gmail.com>
2018-12-17 14:40:10 -05:00
David Enyeart
6a7472e72e [FAB-13126] Align fabric-samples with 1.4.0-rc1 release
Change-Id: I2ff248e93cbac8747c322672f7a831ece597e116
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-12-12 07:55:08 -05:00
Simon Stone
eff00466f3 [FAB-12877] Add fabcar app using new prog model (JS)
Add a new version of the FabCar applications using the new
programming model (fabric-network), written in JavaScript.

Change-Id: I0fcc2e8a10291805d5389c7fc8d1e529debd600a
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-12-07 22:18:50 +00:00
Simon Stone
c18419644d [FAB-12878] Add fabcar app using new prog model (TS)
Add a new version of the FabCar applications using the new
programming model (fabric-network), written in TypeScript.

The new programming model requires a connection profile, so
I have added connection profiles (JSON and YAML) versions to
the basic-network sample. When we switch FabCar to use first-network,
we will have to add connection profiles into that as well.

Change-Id: I81bae907fc64a1cde0234325f37b53e5cd7964e5
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-12-07 22:18:37 +00:00
Simon Stone
928b72b60a [FAB-12875] Add automated tests for fabcar sample
Introduce automated tests for the fabcar sample, that deploy
the new sample contracts and submit the initLedger transaction
using the "peer" CLI.

Additional changes will follow to drive the new sample apps
to ensure that they work as well (but the apps aren't there
yet!).

Change-Id: Ie42d139eb1dc1cf0f7c16f41f54bb5f40309921c
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-11-30 09:52:25 +00:00
rameshthoomu
c05f172ba7 FAB-12608 Update pipeline script
Change-Id: I788c3a6caaf967a4f2157428ee8264b969070acb
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-10-31 14:42:14 -04:00
David Enyeart
c9251480d5 [FAB-12415] samples for 1.3.0 (master cleanup)
fabric-samples already completed in release-1.3 branch.
This CR fixes up version references in master to match.

Change-Id: I95f9d2db5e5fed749560768ca0ba753bb7cae700
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-10-10 17:20:24 -04:00
rameshthoomu
33d333fd46 FAB-12190 Update stable version in CI scripts
Update stable version to 1.4.0-stable in CI scripts

Change-Id: I558442ccce8975533f9123193d7aa343ae883ba5
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-09-26 17:24:07 -04:00
David Enyeart
edee6387f1 [FAB-12184] Prepare fabric-samples for 1.3.0-rc1
Change-Id: I791a7dc50557547036209dbabb5a6c42ee2e0c38
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-09-26 13:16:02 -04:00
David Enyeart
9c6aceed38 [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>
2018-09-16 23:37:04 -04:00
rameshthoomu
5930dfc06a FAB-11488 Update CI script
Update byfn_eyfn.sh script to fetch the binaries from the
correct nexus url.

Change-Id: I0ea675235cc0dce691b8a1bbf30951504f0a8112
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-08-06 12:22:05 -04:00
Kostas Christidis
08aad9ac83 Merge "FAB-9297 fix README links and update bootstrap.sh" 2018-07-27 14:39:59 +00:00
rameshthoomu
ca6959cb5d FAB-11311 Update fabric image version
Update fabric image version to 1.3.0-stable to pull the
latest fabric and fabric-ca docker images

Change-Id: I598b98afa205ca68b37598d159bf0fb9f36fd370
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-07-27 14:20:08 +00:00
Christopher Ferris
6edd320ded FAB-9297 fix README links and update bootstrap.sh
Change-Id: I00cac1a0c01a777af887104064e7dfa775359359
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2018-07-05 12:03:20 +00:00
Christopher Ferris
1745c996b3 Merge "[FAB-10811] fabric-ca sample is broken on v1.2" 2018-06-22 15:20:04 +00:00
Keith Smith
75e293183b [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>
2018-06-22 10:40:33 -04: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
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
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
Christopher Ferris
134549af22 FAB-5412 add fabric-preload.sh script
Add a script to allow users to preload the Fabric docker
images without having to run the curl command in the RTD.

Change-Id: I3b6c682c3e2ab1f230f7af8c3ce0b95bbb8fd024
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2017-07-22 16:58:14 -04:00