diff --git a/packages/artillery/test/cloud-e2e/lambda/lambda-bom.test.js b/packages/artillery/test/cloud-e2e/lambda/lambda-bom.test.js index f19ecef90e..52a672e15d 100644 --- a/packages/artillery/test/cloud-e2e/lambda/lambda-bom.test.js +++ b/packages/artillery/test/cloud-e2e/lambda/lambda-bom.test.js @@ -1,12 +1,16 @@ const tap = require('tap'); const fs = require('fs'); const { $ } = require('zx'); -const { getTestTags, generateTmpReportPath } = require('../../helpers'); +const { + getTestTags, + generateTmpReportPath, + getImageArchitecture +} = require('../../helpers'); const tags = getTestTags(['type:acceptance']); const A9_PATH = process.env.A9_PATH || 'artillery'; -const ARCHITECTURE = process.env.HAS_ARM64_BUILD ? 'arm64' : 'x86_64'; +const ARCHITECTURE = getImageArchitecture(); tap.before(async () => { await $`${A9_PATH} -V`; diff --git a/packages/artillery/test/cloud-e2e/lambda/lambda-dotenv.test.js b/packages/artillery/test/cloud-e2e/lambda/lambda-dotenv.test.js index bc99dce438..cf66c4b59e 100644 --- a/packages/artillery/test/cloud-e2e/lambda/lambda-dotenv.test.js +++ b/packages/artillery/test/cloud-e2e/lambda/lambda-dotenv.test.js @@ -1,11 +1,15 @@ const tap = require('tap'); const fs = require('fs'); const { $ } = require('zx'); -const { getTestTags, generateTmpReportPath } = require('../../helpers'); +const { + getTestTags, + generateTmpReportPath, + getImageArchitecture +} = require('../../helpers'); const tags = getTestTags(['type:acceptance']); const A9_PATH = process.env.A9_PATH || 'artillery'; -const ARCHITECTURE = process.env.HAS_ARM64_BUILD ? 'arm64' : 'x86_64'; +const ARCHITECTURE = getImageArchitecture(); tap.before(async () => { await $`${A9_PATH} -V`; diff --git a/packages/artillery/test/cloud-e2e/lambda/lambda-ensure.test.js b/packages/artillery/test/cloud-e2e/lambda/lambda-ensure.test.js index f9a6be7684..45c0a6cdbb 100644 --- a/packages/artillery/test/cloud-e2e/lambda/lambda-ensure.test.js +++ b/packages/artillery/test/cloud-e2e/lambda/lambda-ensure.test.js @@ -2,7 +2,11 @@ const tap = require('tap'); const { $ } = require('zx'); const chalk = require('chalk'); const fs = require('fs'); -const { generateTmpReportPath, getTestTags } = require('../../helpers'); +const { + generateTmpReportPath, + getTestTags, + getImageArchitecture +} = require('../../helpers'); //NOTE: all these tests report to Artillery Dashboard to dogfood and improve visibility const tags = getTestTags(['type:acceptance']); @@ -13,7 +17,7 @@ tap.beforeEach(async (t) => { }); const A9_PATH = process.env.A9_PATH || 'artillery'; -const ARCHITECTURE = process.env.HAS_ARM64_BUILD ? 'arm64' : 'x86_64'; +const ARCHITECTURE = getImageArchitecture(); tap.before(async () => { await $`${A9_PATH} -V`; diff --git a/packages/artillery/test/cloud-e2e/lambda/lambda-expect.test.js b/packages/artillery/test/cloud-e2e/lambda/lambda-expect.test.js index eec4c067c0..0b17872b0c 100644 --- a/packages/artillery/test/cloud-e2e/lambda/lambda-expect.test.js +++ b/packages/artillery/test/cloud-e2e/lambda/lambda-expect.test.js @@ -2,7 +2,11 @@ const tap = require('tap'); const { $ } = require('zx'); const chalk = require('chalk'); const fs = require('fs'); -const { generateTmpReportPath, getTestTags } = require('../../helpers'); +const { + generateTmpReportPath, + getTestTags, + getImageArchitecture +} = require('../../helpers'); const tags = getTestTags(['type:acceptance']); let reportFilePath; @@ -12,7 +16,7 @@ tap.beforeEach(async (t) => { }); const A9_PATH = process.env.A9_PATH || 'artillery'; -const ARCHITECTURE = process.env.HAS_ARM64_BUILD ? 'arm64' : 'x86_64'; +const ARCHITECTURE = getImageArchitecture(); tap.before(async () => { await $`${A9_PATH} -V`; diff --git a/packages/artillery/test/cloud-e2e/lambda/lambda-smoke.test.js b/packages/artillery/test/cloud-e2e/lambda/lambda-smoke.test.js index 8b3d646c44..6219e920d2 100644 --- a/packages/artillery/test/cloud-e2e/lambda/lambda-smoke.test.js +++ b/packages/artillery/test/cloud-e2e/lambda/lambda-smoke.test.js @@ -1,7 +1,11 @@ const tap = require('tap'); const fs = require('fs'); const { $ } = require('zx'); -const { getTestTags, generateTmpReportPath } = require('../../helpers'); +const { + getTestTags, + generateTmpReportPath, + getImageArchitecture +} = require('../../helpers'); const tags = getTestTags(['type:acceptance']); @@ -12,7 +16,7 @@ tap.beforeEach(async (t) => { }); const A9_PATH = process.env.A9_PATH || 'artillery'; -const ARCHITECTURE = process.env.HAS_ARM64_BUILD ? 'arm64' : 'x86_64'; +const ARCHITECTURE = getImageArchitecture(); tap.before(async () => { await $`${A9_PATH} -V`; diff --git a/packages/artillery/test/helpers/index.js b/packages/artillery/test/helpers/index.js index da40f4f672..4b6a34d61a 100644 --- a/packages/artillery/test/helpers/index.js +++ b/packages/artillery/test/helpers/index.js @@ -47,11 +47,16 @@ function getTestTags(additionalTags) { return `${repoTag},${actorTag},${ciTag},${additionalTags.join(',')}`; } +const getImageArchitecture = () => { + return process.env.HAS_ARM64_BUILD === 'true' ? 'arm64' : 'x86_64'; +}; + module.exports = { execute, deleteFile, getRootPath, returnTmpPath, generateTmpReportPath, - getTestTags + getTestTags, + getImageArchitecture };