From 2ad6c3ad485943b0974589267ea456d2e36744da Mon Sep 17 00:00:00 2001
From: Brad White <brad.white@elastic.co>
Date: Fri, 12 Jul 2024 17:36:46 -0600
Subject: [PATCH 1/4] fix node path

---
 src/dev/build/tasks/bin/scripts/kibana-setup.bat | 2 +-
 src/dev/build/tasks/bin/scripts/kibana.bat       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dev/build/tasks/bin/scripts/kibana-setup.bat b/src/dev/build/tasks/bin/scripts/kibana-setup.bat
index 518e9c08728d2..6fee4a60ea0cd 100755
--- a/src/dev/build/tasks/bin/scripts/kibana-setup.bat
+++ b/src/dev/build/tasks/bin/scripts/kibana-setup.bat
@@ -5,7 +5,7 @@ SETLOCAL ENABLEDELAYEDEXPANSION
 set SCRIPT_DIR=%~dp0
 for %%I in ("%SCRIPT_DIR%..") do set DIR=%%~dpfI
 
-set NODE=%DIR%\node\node.exe
+set NODE=%DIR%\node\default\node.exe
 set NODE_ENV=production
 
 If Not Exist "%NODE%" (
diff --git a/src/dev/build/tasks/bin/scripts/kibana.bat b/src/dev/build/tasks/bin/scripts/kibana.bat
index ce0a0976a2267..80040138cd84c 100755
--- a/src/dev/build/tasks/bin/scripts/kibana.bat
+++ b/src/dev/build/tasks/bin/scripts/kibana.bat
@@ -5,7 +5,7 @@ SETLOCAL ENABLEDELAYEDEXPANSION
 set SCRIPT_DIR=%~dp0
 for %%I in ("%SCRIPT_DIR%..") do set DIR=%%~dpfI
 
-set NODE=%DIR%\node\node.exe
+set NODE=%DIR%\node\default\node.exe
 set NODE_ENV=production
 
 If Not Exist "%NODE%" (

From 52a89fa411e6a346542a55d7ee7a6dff88a021c1 Mon Sep 17 00:00:00 2001
From: Brad White <brad.white@elastic.co>
Date: Fri, 12 Jul 2024 18:33:05 -0600
Subject: [PATCH 2/4] increase build timeout

---
 .buildkite/pipelines/pull_request/base.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipelines/pull_request/base.yml b/.buildkite/pipelines/pull_request/base.yml
index 8b57562c7a329..e5da8ce788e5b 100644
--- a/.buildkite/pipelines/pull_request/base.yml
+++ b/.buildkite/pipelines/pull_request/base.yml
@@ -14,7 +14,7 @@ steps:
       preemptible: true
     key: build
     if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
-    timeout_in_minutes: 60
+    timeout_in_minutes: 90
     retry:
       automatic:
         - exit_status: '-1'

From ff7b0e567d37abf8efb4872ffc648d372efd014d Mon Sep 17 00:00:00 2001
From: Brad White <brad.white@elastic.co>
Date: Fri, 12 Jul 2024 20:39:30 -0600
Subject: [PATCH 3/4] ignore serverless tar for archive

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

diff --git a/.buildkite/scripts/build_kibana.sh b/.buildkite/scripts/build_kibana.sh
index f586f1cbe3b1e..8dc29c98637bf 100755
--- a/.buildkite/scripts/build_kibana.sh
+++ b/.buildkite/scripts/build_kibana.sh
@@ -44,7 +44,7 @@ EOF
 fi
 
 echo "--- Archive Kibana Distribution"
-linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
+linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz' | grep -v 'serverless')"
 installDir="$KIBANA_DIR/install/kibana"
 mkdir -p "$installDir"
 tar -xzf "$linuxBuild" -C "$installDir" --strip=1

From cb7890c7dd761ddd5033e99c7fe255c81872ab1f Mon Sep 17 00:00:00 2001
From: Brad White <brad.white@elastic.co>
Date: Mon, 15 Jul 2024 10:28:47 -0600
Subject: [PATCH 4/4] revert pipeline changes

---
 .buildkite/pipelines/pull_request/base.yml | 2 +-
 .buildkite/scripts/build_kibana.sh         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipelines/pull_request/base.yml b/.buildkite/pipelines/pull_request/base.yml
index e5da8ce788e5b..8b57562c7a329 100644
--- a/.buildkite/pipelines/pull_request/base.yml
+++ b/.buildkite/pipelines/pull_request/base.yml
@@ -14,7 +14,7 @@ steps:
       preemptible: true
     key: build
     if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
-    timeout_in_minutes: 90
+    timeout_in_minutes: 60
     retry:
       automatic:
         - exit_status: '-1'
diff --git a/.buildkite/scripts/build_kibana.sh b/.buildkite/scripts/build_kibana.sh
index 8dc29c98637bf..f586f1cbe3b1e 100755
--- a/.buildkite/scripts/build_kibana.sh
+++ b/.buildkite/scripts/build_kibana.sh
@@ -44,7 +44,7 @@ EOF
 fi
 
 echo "--- Archive Kibana Distribution"
-linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz' | grep -v 'serverless')"
+linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
 installDir="$KIBANA_DIR/install/kibana"
 mkdir -p "$installDir"
 tar -xzf "$linuxBuild" -C "$installDir" --strip=1