From 244b5cc5cd2392b7de9055246367288dc3639ce0 Mon Sep 17 00:00:00 2001
From: Mario Rodriguez Molins <mario.rodriguez@elastic.co>
Date: Fri, 11 Sep 2026 17:28:42 +0200
Subject: [PATCH 1/3] Remove other references to License environment variable

---
 .buildkite/pipeline.publish.yml    | 2 --
 .buildkite/pipeline.serverless.yml | 2 --
 2 files changed, 4 deletions(-)

diff --git a/.buildkite/pipeline.publish.yml b/.buildkite/pipeline.publish.yml
index 25c30dc25f0..1823b82147d 100644
--- a/.buildkite/pipeline.publish.yml
+++ b/.buildkite/pipeline.publish.yml
@@ -10,8 +10,6 @@ env:
   # Elastic package settings
   # Manage docker output/logs
   ELASTIC_PACKAGE_COMPOSE_DISABLE_VERBOSE_OUTPUT: "true"
-  # Default license to use by `elastic-package build`
-  ELASTIC_PACKAGE_REPOSITORY_LICENSE: "licenses/Elastic-2.0.txt"
   # Link definitions path (full path to be set in the corresponding step)
   ELASTIC_PACKAGE_LINKS_FILE_PATH: "links_table.yml"
   # Disable comparison of results in pipeline tests to avoid errors related to GeoIP fields
diff --git a/.buildkite/pipeline.serverless.yml b/.buildkite/pipeline.serverless.yml
index 41dcf089fd3..1eb7896809b 100644
--- a/.buildkite/pipeline.serverless.yml
+++ b/.buildkite/pipeline.serverless.yml
@@ -16,8 +16,6 @@ env:
   # Elastic package settings
   # Manage docker output/logs
   ELASTIC_PACKAGE_COMPOSE_DISABLE_VERBOSE_OUTPUT: "true"
-  # Default license to use by `elastic-package build`
-  ELASTIC_PACKAGE_REPOSITORY_LICENSE: "licenses/Elastic-2.0.txt"
   # Link definitions path (full path to be set in the corresponding step)
   ELASTIC_PACKAGE_LINKS_FILE_PATH: "links_table.yml"
   # Disable comparison of results in pipeline tests to avoid errors related to GeoIP fields

From 5fccdd01030c1f15845744e7a607d8248027d54f Mon Sep 17 00:00:00 2001
From: Mario Rodriguez Molins <mario.rodriguez@elastic.co>
Date: Fri, 11 Sep 2026 17:28:58 +0200
Subject: [PATCH 2/3] Remove unused script

---
 .../scripts/check_published_packages.sh       | 54 -------------------
 1 file changed, 54 deletions(-)
 delete mode 100755 .buildkite/scripts/check_published_packages.sh

diff --git a/.buildkite/scripts/check_published_packages.sh b/.buildkite/scripts/check_published_packages.sh
deleted file mode 100755
index 380d9307bdb..00000000000
--- a/.buildkite/scripts/check_published_packages.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-WORKSPACE="$(pwd)"
-EPR_BASE_URL="https://epr.elastic.co/epr"
-
-published_count=0
-not_published_count=0
-total_count=0
-
-is_published_in_epr() {
-    local name="$1"
-    local version="$2"
-    local http_code
-
-    http_code=$(curl -s -o /dev/null -w "%{http_code}" "${EPR_BASE_URL}/${name}/${name}-${version}.zip")
-    [[ "${http_code}" == "200" ]]
-}
-
-check_packages() {
-    local packages
-    packages=$(mage -d "${WORKSPACE}" listPackages)
-
-    while IFS= read -r package_path; do
-        [[ -z "${package_path}" ]] && continue
-
-        local manifest="${package_path}/manifest.yml"
-        if [[ ! -f "${manifest}" ]]; then
-            echo "[SKIP] ${package_path}: manifest.yml not found"
-            continue
-        fi
-
-        local name version package_zip
-        name=$(yq -r '.name' "${manifest}")
-        version=$(yq -r '.version' "${manifest}")
-        package_zip="${name}-${version}.zip"
-
-        total_count=$((total_count + 1))
-
-        if is_published_in_epr "${name}" "${version}"; then
-            echo "[PUBLISHED]     ${package_zip}"
-            published_count=$((published_count + 1))
-        else
-            echo "[NOT PUBLISHED] ${package_zip}"
-            not_published_count=$((not_published_count + 1))
-        fi
-    done <<< "${packages}"
-}
-
-check_packages
-
-echo ""
-echo "Summary: ${published_count} published, ${not_published_count} not published (${total_count} total)"

From 9540a0a9de6a766de997ffaf0932fc72a780bc64 Mon Sep 17 00:00:00 2001
From: Mario Rodriguez Molins <mario.rodriguez@elastic.co>
Date: Fri, 11 Sep 2026 17:36:54 +0200
Subject: [PATCH 3/3] Revert "Remove other references to License environment
 variable"

This reverts commit 244b5cc5cd2392b7de9055246367288dc3639ce0.
---
 .buildkite/pipeline.publish.yml    | 2 ++
 .buildkite/pipeline.serverless.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.buildkite/pipeline.publish.yml b/.buildkite/pipeline.publish.yml
index 1823b82147d..25c30dc25f0 100644
--- a/.buildkite/pipeline.publish.yml
+++ b/.buildkite/pipeline.publish.yml
@@ -10,6 +10,8 @@ env:
   # Elastic package settings
   # Manage docker output/logs
   ELASTIC_PACKAGE_COMPOSE_DISABLE_VERBOSE_OUTPUT: "true"
+  # Default license to use by `elastic-package build`
+  ELASTIC_PACKAGE_REPOSITORY_LICENSE: "licenses/Elastic-2.0.txt"
   # Link definitions path (full path to be set in the corresponding step)
   ELASTIC_PACKAGE_LINKS_FILE_PATH: "links_table.yml"
   # Disable comparison of results in pipeline tests to avoid errors related to GeoIP fields
diff --git a/.buildkite/pipeline.serverless.yml b/.buildkite/pipeline.serverless.yml
index 1eb7896809b..41dcf089fd3 100644
--- a/.buildkite/pipeline.serverless.yml
+++ b/.buildkite/pipeline.serverless.yml
@@ -16,6 +16,8 @@ env:
   # Elastic package settings
   # Manage docker output/logs
   ELASTIC_PACKAGE_COMPOSE_DISABLE_VERBOSE_OUTPUT: "true"
+  # Default license to use by `elastic-package build`
+  ELASTIC_PACKAGE_REPOSITORY_LICENSE: "licenses/Elastic-2.0.txt"
   # Link definitions path (full path to be set in the corresponding step)
   ELASTIC_PACKAGE_LINKS_FILE_PATH: "links_table.yml"
   # Disable comparison of results in pipeline tests to avoid errors related to GeoIP fields