[build] Rename beats ARM suffix from arm64 to aarch64

elastic · Jan 25, 2022 · 5c3627b · 5c3627b
1 parent 291fa71
commit 5c3627b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/dev/build/tasks/download_cloud_dependencies.ts b/src/dev/build/tasks/download_cloud_dependencies.ts
@@ -20,7 +20,7 @@ export const DownloadCloudDependencies: Task = {
       const version = config.getBuildVersion();
       const buildId = id.match(/[0-9]\.[0-9]\.[0-9]-[0-9a-z]{8}/);
       const buildIdUrl = buildId ? `${buildId[0]}/` : '';
-      const architecture = process.arch === 'arm64' ? 'arm64' : 'x86_64';
+      const architecture = process.arch === 'arm64' ? 'aarch64' : 'x86_64';
       const url = `https://${subdomain}-no-kpi.elastic.co/${buildIdUrl}downloads/beats/${beat}/${beat}-${version}-linux-${architecture}.tar.gz`;
       const checksum = await downloadToString({ log, url: url + '.sha512', expectStatus: 200 });
       const destination = config.resolveFromRepo('.beats', Path.basename(url));

diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.ts b/src/dev/build/tasks/os_packages/docker_generator/run.ts
@@ -55,9 +55,8 @@ export async function runDockerGenerator(
   const artifactArchitecture = flags.architecture === 'aarch64' ? 'aarch64' : 'x86_64';
   const artifactPrefix = `kibana-${version}-linux`;
   const artifactTarball = `${artifactPrefix}-${artifactArchitecture}.tar.gz`;
-  const beatsArchitecture = flags.architecture === 'aarch64' ? 'arm64' : 'x86_64';
-  const metricbeatTarball = `metricbeat-${version}-linux-${beatsArchitecture}.tar.gz`;
-  const filebeatTarball = `filebeat-${version}-linux-${beatsArchitecture}.tar.gz`;
+  const metricbeatTarball = `metricbeat-${version}-linux-${flags.architecture}.tar.gz`;
+  const filebeatTarball = `filebeat-${version}-linux-${flags.architecture}.tar.gz`;
   const artifactsDir = config.resolveFromTarget('.');
   const beatsDir = config.resolveFromRepo('.beats');
   const dockerBuildDate = flags.dockerBuildDate || new Date().toISOString();