test(cli): fix check for arm64 build

artilleryio · Jun 27, 2024 · 26d59ab · 26d59ab
1 parent 6516628
commit 26d59ab
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 };