Increase timeout for chaincode install

Chaincode install using lifecycle was timing out, both at the peer
and client SDK. Changed CORE_CHAINCODE_EXECUTETIMEOUT in peer
docker configuration and explicitly set a longer client side
timeout on the call to Client.sendLifecycleInstallChaincodeRequest().

Change-Id: I00e7c051d38d8129c45229cc5c9d7c3bce378da7
Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>

Author: bestbeforetoday

src/test/fixture/sdkintegration/peer-base/peer-base.yaml

@@ -16,6 +16,7 @@ services:
       - CORE_PEER_GOSSIP_ORGLEADER=false
       - CORE_PEER_CHANNELSERVICE_ENABLED=true
       - CORE_CHAINCODE_STARTUPTIMEOUT=10m  # only cause our vms are so slow!
+      - CORE_CHAINCODE_EXECUTETIMEOUT=300s # Allow more time for chaincode container to build on install
       # The following setting skips the gossip handshake since we are
       # are not doing mutual TLS
       - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/peer/msp

src/test/java/org/hyperledger/fabric/sdk/testutils/TestConfig.java

@@ -132,7 +132,7 @@ private TestConfig() {
             // Default values
 
             defaultProperty(INVOKEWAITTIME, "32000");
-            defaultProperty(DEPLOYWAITTIME, "120000");
+            defaultProperty(DEPLOYWAITTIME, "300000");
             defaultProperty(PROPOSALWAITTIME, "120000");
             defaultProperty(RUNIDEMIXMTTEST, "false");
             defaultProperty(RUNSERVICEDISCOVERYIT, "false");

src/test/java/org/hyperledger/fabric/sdkintegration/End2endLifecycleIT.java

@@ -27,10 +27,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import org.hyperledger.fabric.protos.peer.lifecycle.Lifecycle;
 import org.hyperledger.fabric.sdk.BlockEvent.TransactionEvent;
 import org.hyperledger.fabric.sdk.ChaincodeCollectionConfiguration;
 import org.hyperledger.fabric.sdk.ChaincodeResponse;
@@ -346,8 +344,8 @@ void runChannel(HFClient org1Client, Channel org1Channel, SampleOrg org1, Collec
             final String chaincodeLabel = lifecycleChaincodePackage.getLabel();
             final Type chaincodeType = lifecycleChaincodePackage.getType();
 
-            //Org1 installs the chaincode on it's peers.
-            out("Org1 installs the chaincode on it's peers.");
+            //Org1 installs the chaincode on its peers.
+            out("Org1 installs the chaincode on its peers.");
             String org1ChaincodePackageID = lifecycleInstallChaincode(org1Client, org1MyPeers, lifecycleChaincodePackage);
             assertTrue(org1ChaincodePackageID.contains(chaincodeLabel)); // the packageId should have the label in it so you have some idea what it is.
 
@@ -411,8 +409,8 @@ void runChannel(HFClient org1Client, Channel org1Channel, SampleOrg org1, Collec
 
             org2Client.setUserContext(org2.getPeerAdmin());
 
-            //Org2 installs the chaincode on it's peers
-            out("Org2 installs the chaincode on it's peers.");
+            //Org2 installs the chaincode on its peers
+            out("Org2 installs the chaincode on its peers.");
             String org2ChaincodePackageID = lifecycleInstallChaincode(org2Client, org2MyPeers, org2LifecycleChaincodePackage);
 
             //Sanity check to see if chaincode really is on it's peers and has the hash as expected.
@@ -515,6 +513,7 @@ private String lifecycleInstallChaincode(HFClient client, Collection<Peer> peers
 
         LifecycleInstallChaincodeRequest installProposalRequest = client.newLifecycleInstallChaincodeRequest();
         installProposalRequest.setLifecycleChaincodePackage(lifecycleChaincodePackage);
+        installProposalRequest.setProposalWaitTime(DEPLOYWAITTIME);
 
         Collection<LifecycleInstallChaincodeProposalResponse> responses = client.sendLifecycleInstallChaincodeRequest(installProposalRequest, peers);
         assertNotNull(responses);