Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Support failure store since 8.15.0
  • Loading branch information
jsoriano committed Jul 18, 2024
commit 11cddae91c47fe06c5352888592eab0fa0fea51c
2 changes: 1 addition & 1 deletion internal/stack/_static/docker-compose-stack.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
start_period: 300s
interval: 5s
environment:
- "ES_JAVA_OPTS=-Xms1g -Xmx1g {{ if not (semverLessThan $version "8.14.0") -}}-Des.failure_store_feature_flag_enabled=true{{- end -}}"
- "ES_JAVA_OPTS=-Xms1g -Xmx1g {{ if not (semverLessThan $version "8.15.0-SNAPSHOT") -}}-Des.failure_store_feature_flag_enabled=true{{- end -}}"
- "ELASTIC_PASSWORD={{ $password }}"
volumes:
- "./elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml"
Expand Down
21 changes: 19 additions & 2 deletions scripts/test-check-false-positives.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,33 @@ function check_build_output() {
)
}

function stack_version_args() {
if [[ -z "$PACKAGE_UNDER_TEST" ]]; then
# Don't force stack version if we are testing multiple packages.
return
fi

local package_root=test/packages/${PACKAGE_TEST_TYPE:-false_positives}/${PACKAGE_UNDER_TEST}/
local stack_version_file="${package_root%/}.stack_version"
if [[ ! -f $stack_version_file ]]; then
return
fi

echo -n "--version $(cat $stack_version_file)"
}

trap cleanup EXIT

ELASTIC_PACKAGE_LINKS_FILE_PATH="$(pwd)/scripts/links_table.yml"
export ELASTIC_PACKAGE_LINKS_FILE_PATH

stack_args=$(stack_version_args)

# Update the stack
elastic-package stack update -v
elastic-package stack update -v ${stack_args}

# Boot up the stack
elastic-package stack up -d -v
elastic-package stack up -d -v ${stack_args}

elastic-package stack status

Expand Down
1 change: 1 addition & 0 deletions test/packages/false_positives/failure_store.stack_version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8.15.0-SNAPSHOT