Skip to content

Commit 33743ad

Browse files
authored
feat: allow worker timeout override on Azure ACI (#3527)
1 parent b8baf4d commit 33743ad

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
const pkgJson = require('../../../../package.json');
22
const DEFAULT_IMAGE_TAG = pkgJson.version;
33

4+
// Default wait timeout for cloud workers to start
5+
let WAIT_TIMEOUT_SEC = 600;
6+
7+
// Legacy override
8+
if (process.env.ECS_WAIT_TIMEOUT) {
9+
WAIT_TIMEOUT_SEC = parseInt(process.env.ECS_WAIT_TIMEOUT, 10);
10+
}
11+
12+
// Override
13+
if (process.env.WORKER_WAIT_TIMEOUT_SEC) {
14+
WAIT_TIMEOUT_SEC = parseInt(process.env.WORKER_WAIT_TIMEOUT_SEC, 10);
15+
}
16+
417
module.exports = {
518
ARTILLERY_CLUSTER_NAME: 'artilleryio-cluster',
619
TASK_NAME: 'artilleryio-loadgen-worker',
@@ -9,9 +22,6 @@ module.exports = {
922
LOGGROUP_NAME: 'artilleryio-log-group',
1023
LOGGROUP_RETENTION_DAYS: process.env.ARTILLERY_LOGGROUP_RETENTION_DAYS || 180,
1124
IMAGE_VERSION: process.env.ECR_IMAGE_VERSION || DEFAULT_IMAGE_TAG,
12-
WAIT_TIMEOUT:
13-
typeof process.env.ECS_WAIT_TIMEOUT === 'undefined'
14-
? 600
15-
: parseInt(process.env.ECS_WAIT_TIMEOUT, 10),
25+
WAIT_TIMEOUT: WAIT_TIMEOUT_SEC,
1626
TEST_RUNS_MAX_TAGS: parseInt(process.env.TEST_RUNS_MAX_TAGS, 10) || 8
1727
};

packages/artillery/lib/platform/az/aci.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const util = require('../aws-ecs/legacy/util');
1616
const generateId = require('../../util/generate-id');
1717
const EventEmitter = require('eventemitter3');
1818
const debug = require('debug')('platform:azure-aci');
19-
const { IMAGE_VERSION } = require('../aws-ecs/legacy/constants');
19+
const { IMAGE_VERSION, WAIT_TIMEOUT } = require('../aws-ecs/legacy/constants');
2020
const { regionNames } = require('./regions');
2121
const path = require('path');
2222
const { Timeout, sleep } = require('../aws-ecs/legacy/time');
@@ -345,7 +345,7 @@ class PlatformAzureACI {
345345
this.azureSubscriptionId
346346
);
347347

348-
const provisioningWaitTimeout = new Timeout(5 * 60 * 1000).start();
348+
const provisioningWaitTimeout = new Timeout(WAIT_TIMEOUT * 1000).start();
349349

350350
let containerGroupsInTestRun = [];
351351
while (true) {

0 commit comments

Comments
 (0)