[FAB-15312] fix s390x builds

Increase timeouts on s390x and add work around for crosschaincode issue

Change-Id: I9adf8153c772792a43dd077dd61e74d407bd6b92
Signed-off-by: James Taylor <jamest@uk.ibm.com>

Author: jt-nti

test/fv/crosschaincode.js

@@ -20,6 +20,9 @@ describe('Chaincode crosschaincode', () => {
 
         await utils.installAndInstantiate(suite, 'org.mynamespace.crosschaincode:instantiate');
         await utils.installAndInstantiate(suite2, 'org.mynamespace.crosschaincode2:instantiate');
+
+        // kick crosschaincode2 on org2 - shouldn't need this!
+        await utils.query(suite2, 'org.mynamespace.crosschaincode2:getKey', ['key1']);
     });
 
     describe('Invoke', () => {

test/fv/utils.js

@@ -12,6 +12,10 @@ const fs = require('fs');
 const path = require('path');
 const getTLSArgs = require('../../build/test/utils').getTLSArgs;
 
+// Increase the timeouts on zLinux!
+const arch = require('os').arch();
+const multiplier = arch === 's390x' ? 2 : 1;
+
 function getPackageVersion() {
     const packageJsonPath = path.join(__dirname, './../../package.json');
     const packageJson = fs.readFileSync(packageJsonPath);
@@ -110,12 +114,12 @@ async function installAndInstantiate(ccName, instantiateFunc, instantiateArgs) {
 }
 
 const TIMEOUTS = {
-    LONGEST_STEP : 24000 * 1000,
-    LONG_STEP : 240 * 1000,
-    MED_STEP : 120 * 1000,
-    SHORT_STEP: 60 * 1000,
-    LONG_INC : 30 * 1000,
-    MED_INC : 10 * 1000,
-    SHORT_INC: 5 * 1000
+    LONGEST_STEP : 24000 * 1000 * multiplier,
+    LONG_STEP : 240 * 1000 * multiplier,
+    MED_STEP : 120 * 1000 * multiplier,
+    SHORT_STEP: 60 * 1000 * multiplier,
+    LONG_INC : 30 * 1000 * multiplier,
+    MED_INC : 10 * 1000 * multiplier,
+    SHORT_INC: 5 * 1000 * multiplier
 };
 module.exports = {installAndInstantiate, invoke, query, packPackages, deletePackages, TIMEOUTS};