Skip to content

Commit 1374eef

Browse files
Merge pull request #9 from mbwhite/daily-build
Fix builds & permit daily builds to occur
2 parents baaaef8 + 96f08b7 commit 1374eef

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

ci/azure-pipelines.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@
44
#
55
# fabric-chaincode-java azure pipeline configuration.
66
#
7+
# Daily build for final quality
8+
# cf https://crontab.guru/#0_23_*_*_*
9+
schedules:
10+
- cron: "0 23 * * *"
11+
displayName: 'Chaincode Java Nightly Driver'
12+
branches:
13+
include:
14+
- master
15+
- release-1.4
16+
always: true
17+
18+
19+
720
trigger:
821
branches:
922
include:

fabric-chaincode-integration-test/src/test/resources/first-network/base/peer-base.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@ services:
2323
- CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/tls/server.key
2424
- CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/tls/ca.crt
2525
- CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:amd64-latest
26+
- CORE_CHAINCODE_EXECUTETIMEOUT=300s
2627
working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
2728
command: peer node start

fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/fvt/ChaincodeFVTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ public Response invoke(ChaincodeStub stub) {
330330

331331
server.send(invokeMsg);
332332

333-
ChaincodeMockPeer.checkScenarioStepEnded(server, 9, 5000, TimeUnit.MILLISECONDS);
333+
ChaincodeMockPeer.checkScenarioStepEnded(server, 9, 10000, TimeUnit.MILLISECONDS);
334334
assertThat(server.getLastMessageSend().getType(), is(RESPONSE));
335335
assertThat(server.getLastMessageRcvd().getType(), is(COMPLETED));
336336
assertThat(ProposalResponsePackage.Response.parseFrom(server.getLastMessageRcvd().getPayload()).getMessage(), is("OK response2"));

0 commit comments

Comments
 (0)