Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .buildkite/hooks/pre-command
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export SERVERLESS=${SERVERLESS:-"false"}
export STACK_VERSION=${STACK_VERSION:-""}
export ELASTIC_SUBSCRIPTION=${ELASTIC_SUBSCRIPTION:-""}
export STACK_LOGSDB_ENABLED=${STACK_LOGSDB_ENABLED:-"false"}
export STACK_LOGSDB_COLUMNAR_ENABLED=${STACK_LOGSDB_COLUMNAR_ENABLED:-"false"}
export FORCE_CHECK_ALL=${FORCE_CHECK_ALL:-"false"}
export PUBLISH_COVERAGE_REPORTS=${PUBLISH_COVERAGE_REPORTS:-"false"}

Expand Down
8 changes: 7 additions & 1 deletion .buildkite/scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ prepare_stack() {

local requiredSubscription="${ELASTIC_SUBSCRIPTION:-""}"
local requiredLogsDB="${STACK_LOGSDB_ENABLED:-"false"}"
local requiredLogsDBColumnar="${STACK_LOGSDB_COLUMNAR_ENABLED:-"false"}"

local args="-v"
local version_set=""
Expand Down Expand Up @@ -506,6 +507,11 @@ prepare_stack() {
args="${args} -U stack.logsdb_enabled=true"
fi

if [ "${requiredLogsDBColumnar:-false}" == "true" ]; then
echoerr "- Enable LogsDB Columnar"
args="${args} -U stack.logsdb_columnar_enabled=true"
fi

if [ "${requiredSubscription}" != "" ]; then
echoerr "- Set Subscription ${ELASTIC_SUBSCRIPTION}"
args="${args} -U stack.elastic_subscription=${requiredSubscription}"
Expand Down Expand Up @@ -733,7 +739,7 @@ is_pr_affected() {
return 1
fi

if [[ "${STACK_LOGSDB_ENABLED:-"false"}" == "true" ]]; then
if [[ "${STACK_LOGSDB_ENABLED:-"false"}" == "true" || "${STACK_LOGSDB_COLUMNAR_ENABLED:-"false"}" == "true" ]]; then
# Packages require to support 8.17.0 or higher as part of their Kibana constraints (manifest)
local logsdb_compatible=""
if ! logsdb_compatible=$(is_logsdb_compatible); then
Expand Down
12 changes: 12 additions & 0 deletions .buildkite/scripts/trigger_integrations_in_parallel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ echo "Checking with commits: from: '${from}' to: '${to}'"
# This variable does not exist in builds triggered automatically
GITHUB_PR_TRIGGER_COMMENT="${GITHUB_PR_TRIGGER_COMMENT:-""}"

# One-off path for PR 19907: run full package coverage against the
# elastic-package LogsDB Columnar implementation under test.
if [[ "${BUILDKITE_PULL_REQUEST:-"false"}" == "19907" ]]; then
echo "--- Enable one-off LogsDB Columnar full test mode for PR 19907"
export FORCE_CHECK_ALL="true"
export STACK_VERSION="9.5.0-SNAPSHOT"
export STACK_LOGSDB_ENABLED="true"
export STACK_LOGSDB_COLUMNAR_ENABLED="true"
fi

if [[ "${BUILDKITE_PIPELINE_SLUG}" == "integrations-test-stack" && "${GITHUB_PR_TRIGGER_COMMENT}" =~ ^/test\ stack ]]; then
echo "--- Stack version set from Github comment"
STACK_VERSION=$(echo "$GITHUB_PR_TRIGGER_COMMENT" | cut -d " " -f 3)
Expand Down Expand Up @@ -74,6 +84,8 @@ for package_path in ${PACKAGE_LIST}; do
env:
STACK_VERSION: "${STACK_VERSION}"
FORCE_CHECK_ALL: "${FORCE_CHECK_ALL}"
STACK_LOGSDB_ENABLED: "${STACK_LOGSDB_ENABLED:-false}"
STACK_LOGSDB_COLUMNAR_ENABLED: "${STACK_LOGSDB_COLUMNAR_ENABLED:-false}"
SERVERLESS: "false"
UPLOAD_SAFE_LOGS: ${UPLOAD_SAFE_LOGS}
plugins:
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -258,3 +258,5 @@ require (
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)

replace github.com/elastic/elastic-package => github.com/andrewkroh/elastic-package v0.0.0-20260715132110-b21241672249
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f h1:tCbYj7/299ek
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f/go.mod h1:gcr0kNtGBqin9zDW9GOHcVntrwnjrK+qdJ06mWYBybw=
github.com/ProtonMail/gopenpgp/v2 v2.10.0 h1:llCzLvntC9+iH+if/na4AgKTef/Zm4vpaRrR3+JdKvo=
github.com/ProtonMail/gopenpgp/v2 v2.10.0/go.mod h1:dc0h9Pg3ftfN0U4pfRzujilfh61A2R52wgMkZWcWm2I=
github.com/andrewkroh/elastic-package v0.0.0-20260715132110-b21241672249 h1:Fk2K7MZRSrC8j7anJH+NqPBg+XNTinbqovAOm/NmZOI=
github.com/andrewkroh/elastic-package v0.0.0-20260715132110-b21241672249/go.mod h1:m5iUfFytvzGt/Wa1RJYMovTz1n9R1VsK/jroEUXe450=
github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
Expand Down Expand Up @@ -134,8 +136,6 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/elastic/elastic-integration-corpus-generator-tool v0.12.3 h1:BdG4+sQnp2nKcVsaqm3uFxAXpDPQZ/m5UkrvHYDUvKA=
github.com/elastic/elastic-integration-corpus-generator-tool v0.12.3/go.mod h1:WkEV9RTONlShTMAQgm+4o7iV5rkO2nDB0ykCAF4hJrs=
github.com/elastic/elastic-package v0.125.1 h1:mpWdus9SLf0iZba8w1A4eAhUQKCY5Z+WjcUlLhCZxCA=
github.com/elastic/elastic-package v0.125.1/go.mod h1:zYViXD8xzECLg8uwUTf10xmh+JRemA5jrMGrNGIoxSI=
github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo=
github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4=
github.com/elastic/go-licenser v0.4.2 h1:bPbGm8bUd8rxzSswFOqvQh1dAkKGkgAmrPxbUi+Y9+A=
Expand Down
Loading