From 621780eb1d85076893e8a45b000b9886126c3153 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Tue, 22 Mar 2022 09:40:49 -0500
Subject: [PATCH 01/11] [build] Cross compile docker images

---
 .../tasks/os_packages/docker_generator/run.ts      | 14 ++------------
 .../templates/build_docker_sh.template.ts          |  3 ++-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.ts b/src/dev/build/tasks/os_packages/docker_generator/run.ts
index 332605e926537..82c29bf8d0361 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/run.ts
+++ b/src/dev/build/tasks/os_packages/docker_generator/run.ts
@@ -63,9 +63,9 @@ export async function runDockerGenerator(
   const dockerBuildDate = flags.dockerBuildDate || new Date().toISOString();
   // That would produce oss, default and default-ubi7
   const dockerBuildDir = config.resolveFromRepo('build', 'kibana-docker', `default${imageFlavor}`);
-  const imageArchitecture = flags.architecture === 'aarch64' ? '-aarch64' : '';
+  const imageArchitecture = flags.architecture === 'aarch64' ? 'arm64' : 'amd64';
   const dockerTargetFilename = config.resolveFromTarget(
-    `kibana${imageFlavor}-${version}-docker-image${imageArchitecture}.tar.gz`
+    `kibana${imageFlavor}-${version}-docker-image-${imageArchitecture}.tar.gz`
   );
   const dependencies = [
     resolve(artifactsDir, artifactTarball),
@@ -104,16 +104,6 @@ export async function runDockerGenerator(
     publicArtifactSubdomain,
   };
 
-  type HostArchitectureToDocker = Record<string, string>;
-  const hostTarget: HostArchitectureToDocker = {
-    x64: 'x64',
-    arm64: 'aarch64',
-  };
-  const buildArchitectureSupported = hostTarget[process.arch] === flags.architecture;
-  if (flags.architecture && !buildArchitectureSupported) {
-    return;
-  }
-
   // Create the docker build target folder
   await mkdirp(dockerBuildDir);
 
diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts b/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts
index de26705566585..df5d39b85d806 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts
+++ b/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts
@@ -23,6 +23,7 @@ function generator({
   const dockerTargetName = `${imageTag}${imageFlavor}:${version}${
     dockerTagQualifier ? '-' + dockerTagQualifier : ''
   }`;
+  const dockerArchitecutre = architecture === 'aarch64' ? 'linux/arm64' : 'linux/amd64';
   return dedent(`
   #!/usr/bin/env bash
   #
@@ -59,7 +60,7 @@ function generator({
   retry_docker_pull ${baseOSImage}
 
   echo "Building: kibana${imageFlavor}-docker"; \\
-  docker build -t ${dockerTargetName} -f Dockerfile . || exit 1;
+  docker buildx build --platform ${dockerArchitecutre} -t ${dockerTargetName} -f Dockerfile . || exit 1;
 
   docker save ${dockerTargetName} | gzip -c > ${dockerTargetFilename}
 

From 866935891dbf763f6688dd49e4966e4f9cc9129c Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Tue, 22 Mar 2022 09:42:47 -0500
Subject: [PATCH 02/11] typo

---
 .../docker_generator/templates/build_docker_sh.template.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts b/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts
index df5d39b85d806..a14de2a0581ff 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts
+++ b/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts
@@ -23,7 +23,7 @@ function generator({
   const dockerTargetName = `${imageTag}${imageFlavor}:${version}${
     dockerTagQualifier ? '-' + dockerTagQualifier : ''
   }`;
-  const dockerArchitecutre = architecture === 'aarch64' ? 'linux/arm64' : 'linux/amd64';
+  const dockerArchitecture = architecture === 'aarch64' ? 'linux/arm64' : 'linux/amd64';
   return dedent(`
   #!/usr/bin/env bash
   #
@@ -60,7 +60,7 @@ function generator({
   retry_docker_pull ${baseOSImage}
 
   echo "Building: kibana${imageFlavor}-docker"; \\
-  docker buildx build --platform ${dockerArchitecutre} -t ${dockerTargetName} -f Dockerfile . || exit 1;
+  docker buildx build --platform ${dockerArchitecture} -t ${dockerTargetName} -f Dockerfile . || exit 1;
 
   docker save ${dockerTargetName} | gzip -c > ${dockerTargetFilename}
 

From b724ab51389b65cd202f71d9a67975a4d621b2ad Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Tue, 22 Mar 2022 10:23:06 -0500
Subject: [PATCH 03/11] debug

---
 .buildkite/scripts/build_kibana.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.buildkite/scripts/build_kibana.sh b/.buildkite/scripts/build_kibana.sh
index a7fbcc0ea4b92..65d93a05591a0 100755
--- a/.buildkite/scripts/build_kibana.sh
+++ b/.buildkite/scripts/build_kibana.sh
@@ -8,6 +8,7 @@ echo "--- Build Kibana Distribution"
 if [[ "${GITHUB_PR_LABELS:-}" == *"ci:build-all-platforms"* ]]; then
   node scripts/build --all-platforms --skip-os-packages
 elif [[ "${GITHUB_PR_LABELS:-}" == *"ci:build-os-packages"* ]]; then
+  docker buildx inspect --bootstrap
   node scripts/build --all-platforms
 else
   node scripts/build

From 1d0f93e95b1a383652b6cc4d69f8d9be8fe977b9 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Tue, 22 Mar 2022 16:25:35 -0500
Subject: [PATCH 04/11] Revert "[build] Cross compile docker images"

This reverts commit 621780eb1d85076893e8a45b000b9886126c3153.
---
 .../tasks/os_packages/docker_generator/run.ts      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.ts b/src/dev/build/tasks/os_packages/docker_generator/run.ts
index 82c29bf8d0361..332605e926537 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/run.ts
+++ b/src/dev/build/tasks/os_packages/docker_generator/run.ts
@@ -63,9 +63,9 @@ export async function runDockerGenerator(
   const dockerBuildDate = flags.dockerBuildDate || new Date().toISOString();
   // That would produce oss, default and default-ubi7
   const dockerBuildDir = config.resolveFromRepo('build', 'kibana-docker', `default${imageFlavor}`);
-  const imageArchitecture = flags.architecture === 'aarch64' ? 'arm64' : 'amd64';
+  const imageArchitecture = flags.architecture === 'aarch64' ? '-aarch64' : '';
   const dockerTargetFilename = config.resolveFromTarget(
-    `kibana${imageFlavor}-${version}-docker-image-${imageArchitecture}.tar.gz`
+    `kibana${imageFlavor}-${version}-docker-image${imageArchitecture}.tar.gz`
   );
   const dependencies = [
     resolve(artifactsDir, artifactTarball),
@@ -104,6 +104,16 @@ export async function runDockerGenerator(
     publicArtifactSubdomain,
   };
 
+  type HostArchitectureToDocker = Record<string, string>;
+  const hostTarget: HostArchitectureToDocker = {
+    x64: 'x64',
+    arm64: 'aarch64',
+  };
+  const buildArchitectureSupported = hostTarget[process.arch] === flags.architecture;
+  if (flags.architecture && !buildArchitectureSupported) {
+    return;
+  }
+
   // Create the docker build target folder
   await mkdirp(dockerBuildDir);
 

From df87f060724f7dfc29614c59d568d89c12782035 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Tue, 22 Mar 2022 16:26:43 -0500
Subject: [PATCH 05/11] revert

---
 .buildkite/scripts/build_kibana.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.buildkite/scripts/build_kibana.sh b/.buildkite/scripts/build_kibana.sh
index 65d93a05591a0..a7fbcc0ea4b92 100755
--- a/.buildkite/scripts/build_kibana.sh
+++ b/.buildkite/scripts/build_kibana.sh
@@ -8,7 +8,6 @@ echo "--- Build Kibana Distribution"
 if [[ "${GITHUB_PR_LABELS:-}" == *"ci:build-all-platforms"* ]]; then
   node scripts/build --all-platforms --skip-os-packages
 elif [[ "${GITHUB_PR_LABELS:-}" == *"ci:build-os-packages"* ]]; then
-  docker buildx inspect --bootstrap
   node scripts/build --all-platforms
 else
   node scripts/build

From 0a731657ba3ad8c474dc08df0ac303dc3aeb33bf Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Wed, 23 Mar 2022 08:11:41 -0500
Subject: [PATCH 06/11] support docker-cross-compile flag

---
 src/dev/build/args.test.ts                            |  7 +++++++
 src/dev/build/args.ts                                 |  3 +++
 src/dev/build/build_distributables.ts                 |  1 +
 src/dev/build/cli.ts                                  |  1 +
 src/dev/build/lib/config.ts                           | 11 +++++++++++
 .../build/tasks/os_packages/docker_generator/run.ts   |  3 ++-
 6 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/dev/build/args.test.ts b/src/dev/build/args.test.ts
index c06c13230c63f..b0f39840ba440 100644
--- a/src/dev/build/args.test.ts
+++ b/src/dev/build/args.test.ts
@@ -36,6 +36,7 @@ it('build default and oss dist for current platform, without packages, by defaul
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": false,
+        "dockerCrossCompile": false,
         "dockerPush": false,
         "dockerTagQualifier": null,
         "downloadCloudDependencies": true,
@@ -67,6 +68,7 @@ it('builds packages if --all-platforms is passed', () => {
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": true,
+        "dockerCrossCompile": false,
         "dockerPush": false,
         "dockerTagQualifier": null,
         "downloadCloudDependencies": true,
@@ -98,6 +100,7 @@ it('limits packages if --rpm passed with --all-platforms', () => {
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": true,
+        "dockerCrossCompile": false,
         "dockerPush": false,
         "dockerTagQualifier": null,
         "downloadCloudDependencies": true,
@@ -129,6 +132,7 @@ it('limits packages if --deb passed with --all-platforms', () => {
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": false,
+        "dockerCrossCompile": false,
         "dockerPush": false,
         "dockerTagQualifier": null,
         "downloadCloudDependencies": true,
@@ -161,6 +165,7 @@ it('limits packages if --docker passed with --all-platforms', () => {
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": false,
+        "dockerCrossCompile": false,
         "dockerPush": false,
         "dockerTagQualifier": null,
         "downloadCloudDependencies": true,
@@ -200,6 +205,7 @@ it('limits packages if --docker passed with --skip-docker-ubi and --all-platform
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": false,
+        "dockerCrossCompile": false,
         "dockerPush": false,
         "dockerTagQualifier": null,
         "downloadCloudDependencies": true,
@@ -232,6 +238,7 @@ it('limits packages if --all-platforms passed with --skip-docker-ubuntu', () =>
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": true,
+        "dockerCrossCompile": false,
         "dockerPush": false,
         "dockerTagQualifier": null,
         "downloadCloudDependencies": true,
diff --git a/src/dev/build/args.ts b/src/dev/build/args.ts
index 03fe49b72c954..2bad2c0721e2e 100644
--- a/src/dev/build/args.ts
+++ b/src/dev/build/args.ts
@@ -22,6 +22,7 @@ export function readCliArgs(argv: string[]) {
       'skip-os-packages',
       'rpm',
       'deb',
+      'docker-cross-compile',
       'docker-images',
       'docker-push',
       'skip-docker-contexts',
@@ -52,6 +53,7 @@ export function readCliArgs(argv: string[]) {
       rpm: null,
       deb: null,
       'docker-images': null,
+      'docker-cross-compile': false,
       'docker-push': false,
       'docker-tag-qualifier': null,
       'version-qualifier': '',
@@ -112,6 +114,7 @@ export function readCliArgs(argv: string[]) {
   const buildOptions: BuildOptions = {
     isRelease: Boolean(flags.release),
     versionQualifier: flags['version-qualifier'],
+    dockerCrossCompile: Boolean(flags['docker-cross-compile']),
     dockerPush: Boolean(flags['docker-push']),
     dockerTagQualifier: flags['docker-tag-qualifier'],
     initialize: !Boolean(flags['skip-initialize']),
diff --git a/src/dev/build/build_distributables.ts b/src/dev/build/build_distributables.ts
index 4fb849988cb60..d2b2d24667bce 100644
--- a/src/dev/build/build_distributables.ts
+++ b/src/dev/build/build_distributables.ts
@@ -13,6 +13,7 @@ import * as Tasks from './tasks';
 
 export interface BuildOptions {
   isRelease: boolean;
+  dockerCrossCompile: boolean;
   dockerPush: boolean;
   dockerTagQualifier: string | null;
   downloadFreshNode: boolean;
diff --git a/src/dev/build/cli.ts b/src/dev/build/cli.ts
index ffcbb68215ab7..561e2aea5c15d 100644
--- a/src/dev/build/cli.ts
+++ b/src/dev/build/cli.ts
@@ -39,6 +39,7 @@ if (showHelp) {
         --rpm                   {dim Only build the rpm packages}
         --deb                   {dim Only build the deb packages}
         --docker-images         {dim Only build the Docker images}
+        --docker-cross-compile  {dim Produce arm64 and amd64 Docker images}
         --docker-contexts       {dim Only build the Docker build contexts}
         --skip-docker-ubi       {dim Don't build the docker ubi image}
         --skip-docker-ubuntu    {dim Don't build the docker ubuntu image}
diff --git a/src/dev/build/lib/config.ts b/src/dev/build/lib/config.ts
index 650af04dfd54b..2bab1d28f9ef7 100644
--- a/src/dev/build/lib/config.ts
+++ b/src/dev/build/lib/config.ts
@@ -17,6 +17,7 @@ interface Options {
   isRelease: boolean;
   targetAllPlatforms: boolean;
   versionQualifier?: string;
+  dockerCrossCompile: boolean;
   dockerTagQualifier: string | null;
   dockerPush: boolean;
 }
@@ -35,6 +36,7 @@ export class Config {
     isRelease,
     targetAllPlatforms,
     versionQualifier,
+    dockerCrossCompile,
     dockerTagQualifier,
     dockerPush,
   }: Options) {
@@ -51,6 +53,7 @@ export class Config {
         versionQualifier,
         pkg,
       }),
+      dockerCrossCompile,
       dockerTagQualifier,
       dockerPush,
       isRelease
@@ -63,6 +66,7 @@ export class Config {
     private readonly nodeVersion: string,
     private readonly repoRoot: string,
     private readonly versionInfo: VersionInfo,
+    private readonly dockerCrossCompile: boolean,
     private readonly dockerTagQualifier: string | null,
     private readonly dockerPush: boolean,
     public readonly isRelease: boolean
@@ -96,6 +100,13 @@ export class Config {
     return this.dockerPush;
   }
 
+  /**
+   * Get docker cross compile
+   */
+  getDockerCrossCompile() {
+    return this.dockerCrossCompile;
+  }
+
   /**
    * Convert an absolute path to a relative path, based from the repo
    */
diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.ts b/src/dev/build/tasks/os_packages/docker_generator/run.ts
index 332605e926537..3152f07628fc9 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/run.ts
+++ b/src/dev/build/tasks/os_packages/docker_generator/run.ts
@@ -76,6 +76,7 @@ export async function runDockerGenerator(
 
   const dockerPush = config.getDockerPush();
   const dockerTagQualifier = config.getDockerTagQualfiier();
+  const dockerCrossCompile = config.getDockerCrossCompile();
   const publicArtifactSubdomain = config.isRelease ? 'artifacts' : 'snapshots-no-kpi';
 
   const scope: TemplateContext = {
@@ -110,7 +111,7 @@ export async function runDockerGenerator(
     arm64: 'aarch64',
   };
   const buildArchitectureSupported = hostTarget[process.arch] === flags.architecture;
-  if (flags.architecture && !buildArchitectureSupported) {
+  if (flags.architecture && !buildArchitectureSupported && !dockerCrossCompile) {
     return;
   }
 

From 9e83621f78e341a90083391742700466db5d8b0f Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Wed, 23 Mar 2022 08:56:11 -0500
Subject: [PATCH 07/11] fix types/tests

---
 src/dev/build/lib/build.test.ts  | 1 +
 src/dev/build/lib/config.test.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/dev/build/lib/build.test.ts b/src/dev/build/lib/build.test.ts
index 8ea2a20d83960..3da87ff13b1ee 100644
--- a/src/dev/build/lib/build.test.ts
+++ b/src/dev/build/lib/build.test.ts
@@ -32,6 +32,7 @@ const config = new Config(
     buildSha: 'abcd1234',
     buildVersion: '8.0.0',
   },
+  false,
   '',
   false,
   true
diff --git a/src/dev/build/lib/config.test.ts b/src/dev/build/lib/config.test.ts
index 3f90c8738d8e2..2195406270bdd 100644
--- a/src/dev/build/lib/config.test.ts
+++ b/src/dev/build/lib/config.test.ts
@@ -29,6 +29,7 @@ const setup = async ({ targetAllPlatforms = true }: { targetAllPlatforms?: boole
   return await Config.create({
     isRelease: true,
     targetAllPlatforms,
+    dockerCrossCompile: false,
     dockerPush: false,
     dockerTagQualifier: '',
   });

From a734d8e22e3b9bcdf9e6359fa5a2f64f5afbfa68 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Wed, 23 Mar 2022 09:00:38 -0500
Subject: [PATCH 08/11] fix more tests

---
 src/dev/build/tasks/nodejs/download_node_builds_task.test.ts     | 1 +
 src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts      | 1 +
 .../build/tasks/nodejs/verify_existing_node_builds_task.test.ts  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/dev/build/tasks/nodejs/download_node_builds_task.test.ts b/src/dev/build/tasks/nodejs/download_node_builds_task.test.ts
index b1309bd05c603..c3b9cd5f8c6b1 100644
--- a/src/dev/build/tasks/nodejs/download_node_builds_task.test.ts
+++ b/src/dev/build/tasks/nodejs/download_node_builds_task.test.ts
@@ -39,6 +39,7 @@ async function setup({ failOnUrl }: { failOnUrl?: string } = {}) {
   const config = await Config.create({
     isRelease: true,
     targetAllPlatforms: true,
+    dockerCrossCompile: false,
     dockerPush: false,
     dockerTagQualifier: '',
   });
diff --git a/src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts b/src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts
index fb0891c24f3b0..0041829984aa7 100644
--- a/src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts
+++ b/src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts
@@ -43,6 +43,7 @@ async function setup() {
   const config = await Config.create({
     isRelease: true,
     targetAllPlatforms: true,
+    dockerCrossCompile: false,
     dockerPush: false,
     dockerTagQualifier: '',
   });
diff --git a/src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts b/src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts
index 3a71a2b06fe91..85458c29ddcff 100644
--- a/src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts
+++ b/src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts
@@ -48,6 +48,7 @@ async function setup(actualShaSums?: Record<string, string>) {
   const config = await Config.create({
     isRelease: true,
     targetAllPlatforms: true,
+    dockerCrossCompile: false,
     dockerPush: false,
     dockerTagQualifier: '',
   });

From abae2fd720b14d5af22464f22260f663fa8b5bba Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Wed, 23 Mar 2022 09:38:59 -0500
Subject: [PATCH 09/11] download cloud dependencies based on cross compile flag

---
 .../tasks/download_cloud_dependencies.ts      | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/dev/build/tasks/download_cloud_dependencies.ts b/src/dev/build/tasks/download_cloud_dependencies.ts
index 6ecc09c21ddce..9edd5c4153ab6 100644
--- a/src/dev/build/tasks/download_cloud_dependencies.ts
+++ b/src/dev/build/tasks/download_cloud_dependencies.ts
@@ -20,18 +20,24 @@ 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 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));
-      return downloadToDisk({
-        log,
-        url,
-        destination,
-        shaChecksum: checksum.split(' ')[0],
-        shaAlgorithm: 'sha512',
-        maxAttempts: 3,
+
+      const localArchitecture = [process.arch === 'arm64' ? 'arm64' : 'x86_64'];
+      const allArchitectures = ['arm64, x86_64'];
+      const architectures = config.getDockerCrossCompile() ? allArchitectures : localArchitecture;
+      const downloads = architectures.map(async (arch) => {
+        const url = `https://${subdomain}-no-kpi.elastic.co/${buildIdUrl}downloads/beats/${beat}/${beat}-${version}-linux-${arch}.tar.gz`;
+        const checksum = await downloadToString({ log, url: url + '.sha512', expectStatus: 200 });
+        const destination = config.resolveFromRepo('.beats', Path.basename(url));
+        return downloadToDisk({
+          log,
+          url,
+          destination,
+          shaChecksum: checksum.split(' ')[0],
+          shaAlgorithm: 'sha512',
+          maxAttempts: 3,
+        });
       });
+      return Promise.all(downloads);
     };
 
     let buildId = '';

From d25b41ab9ae18b90afb0934f4c036646017d84d8 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Wed, 23 Mar 2022 09:41:51 -0500
Subject: [PATCH 10/11] fix array

---
 src/dev/build/tasks/download_cloud_dependencies.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dev/build/tasks/download_cloud_dependencies.ts b/src/dev/build/tasks/download_cloud_dependencies.ts
index 9edd5c4153ab6..31873550f6b4a 100644
--- a/src/dev/build/tasks/download_cloud_dependencies.ts
+++ b/src/dev/build/tasks/download_cloud_dependencies.ts
@@ -22,7 +22,7 @@ export const DownloadCloudDependencies: Task = {
       const buildIdUrl = buildId ? `${buildId[0]}/` : '';
 
       const localArchitecture = [process.arch === 'arm64' ? 'arm64' : 'x86_64'];
-      const allArchitectures = ['arm64, x86_64'];
+      const allArchitectures = ['arm64', 'x86_64'];
       const architectures = config.getDockerCrossCompile() ? allArchitectures : localArchitecture;
       const downloads = architectures.map(async (arch) => {
         const url = `https://${subdomain}-no-kpi.elastic.co/${buildIdUrl}downloads/beats/${beat}/${beat}-${version}-linux-${arch}.tar.gz`;

From e34e417e44330b42e5973961dd1022803286d032 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Wed, 23 Mar 2022 09:45:29 -0500
Subject: [PATCH 11/11] fix more tests

---
 src/dev/build/lib/runner.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dev/build/lib/runner.test.ts b/src/dev/build/lib/runner.test.ts
index 7c49c35446833..94ff3cb338176 100644
--- a/src/dev/build/lib/runner.test.ts
+++ b/src/dev/build/lib/runner.test.ts
@@ -50,6 +50,7 @@ const setup = async () => {
     isRelease: true,
     targetAllPlatforms: true,
     versionQualifier: '-SNAPSHOT',
+    dockerCrossCompile: false,
     dockerPush: false,
     dockerTagQualifier: '',
   });