From 82029e5f9a53389ae08343697285403fb8114cfa Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Mon, 4 Apr 2022 13:40:35 -0500
Subject: [PATCH] [artifacts] Merge package testing with release artifacts
 (#129378)

* [artifacts] Merge package testing with release artifacts

* fix

* fix relative dir
---
 .buildkite/pipelines/artifacts.yml          | 20 ++++++++++++++++++++
 .buildkite/scripts/steps/artifacts/build.sh |  4 ++++
 2 files changed, 24 insertions(+)

diff --git a/.buildkite/pipelines/artifacts.yml b/.buildkite/pipelines/artifacts.yml
index 9ec56ff44c63e..e934b01d8a4d9 100644
--- a/.buildkite/pipelines/artifacts.yml
+++ b/.buildkite/pipelines/artifacts.yml
@@ -4,3 +4,23 @@ steps:
     agents:
       queue: c2-16
     timeout_in_minutes: 60
+
+  - wait
+
+  - command: TEST_PACKAGE=deb .buildkite/scripts/steps/package_testing/test.sh
+    label: Package testing for deb
+    agents:
+      queue: n2-4-virt
+    timeout_in_minutes: 20
+
+  - command: TEST_PACKAGE=rpm .buildkite/scripts/steps/package_testing/test.sh
+    label: Package testing for rpm
+    agents:
+      queue: n2-4-virt
+    timeout_in_minutes: 20
+
+  - command: TEST_PACKAGE=docker .buildkite/scripts/steps/package_testing/test.sh
+    label: Package testing for docker
+    agents:
+      queue: n2-4-virt
+    timeout_in_minutes: 20
diff --git a/.buildkite/scripts/steps/artifacts/build.sh b/.buildkite/scripts/steps/artifacts/build.sh
index 9c8375e1b4b48..f8c67dcd1d98e 100644
--- a/.buildkite/scripts/steps/artifacts/build.sh
+++ b/.buildkite/scripts/steps/artifacts/build.sh
@@ -17,3 +17,7 @@ node scripts/build "$RELEASE_ARG" --all-platforms --debug --docker-cross-compile
 
 echo "--- Build dependencies report"
 node scripts/licenses_csv_report "--csv=target/dependencies-$VERSION.csv"
+
+cd target
+buildkite-agent artifact upload "*"
+cd -