Skip to content

Commit 5f87412

Browse files
committed
[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>
1 parent aba36b0 commit 5f87412

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

test/fv/crosschaincode.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ describe('Chaincode crosschaincode', () => {
2020

2121
await utils.installAndInstantiate(suite, 'org.mynamespace.crosschaincode:instantiate');
2222
await utils.installAndInstantiate(suite2, 'org.mynamespace.crosschaincode2:instantiate');
23+
24+
// kick crosschaincode2 on org2 - shouldn't need this!
25+
await utils.query(suite2, 'org.mynamespace.crosschaincode2:getKey', ['key1']);
2326
});
2427

2528
describe('Invoke', () => {

test/fv/utils.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ const fs = require('fs');
1212
const path = require('path');
1313
const getTLSArgs = require('../../build/test/utils').getTLSArgs;
1414

15+
// Increase the timeouts on zLinux!
16+
const arch = require('os').arch();
17+
const multiplier = arch === 's390x' ? 2 : 1;
18+
1519
function getPackageVersion() {
1620
const packageJsonPath = path.join(__dirname, './../../package.json');
1721
const packageJson = fs.readFileSync(packageJsonPath);
@@ -110,12 +114,12 @@ async function installAndInstantiate(ccName, instantiateFunc, instantiateArgs) {
110114
}
111115

112116
const TIMEOUTS = {
113-
LONGEST_STEP : 24000 * 1000,
114-
LONG_STEP : 240 * 1000,
115-
MED_STEP : 120 * 1000,
116-
SHORT_STEP: 60 * 1000,
117-
LONG_INC : 30 * 1000,
118-
MED_INC : 10 * 1000,
119-
SHORT_INC: 5 * 1000
117+
LONGEST_STEP : 24000 * 1000 * multiplier,
118+
LONG_STEP : 240 * 1000 * multiplier,
119+
MED_STEP : 120 * 1000 * multiplier,
120+
SHORT_STEP: 60 * 1000 * multiplier,
121+
LONG_INC : 30 * 1000 * multiplier,
122+
MED_INC : 10 * 1000 * multiplier,
123+
SHORT_INC: 5 * 1000 * multiplier
120124
};
121125
module.exports = {installAndInstantiate, invoke, query, packPackages, deletePackages, TIMEOUTS};

0 commit comments

Comments
 (0)