Skip to content

Update .travis.yml to account for 9.x / main #1220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 4, 2025
Merged

Update .travis.yml to account for 9.x / main #1220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bee23d5
Update .travis.yml to account for 9.1.0
jsvd Aug 4, 2025
01642d7
Update docker-setup.sh
jsvd Aug 4, 2025
3c3c507
Update docker-setup.sh
jsvd Aug 4, 2025
64d3d6c
fix failing tests due to failure store being on in logs data stream
jsvd Aug 4, 2025
5b52990
Update spec/integration/outputs/metrics_spec.rb
jsvd Aug 4, 2025
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
16 changes: 8 additions & 8 deletions .ci/docker-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ pull_docker_snapshot() {
if docker pull "$docker_image" ; then
echo "docker pull successful"
else
case "$ELASTIC_STACK_VERSION_ARG" in
"8.previous"|"8.current"|"8.next")
exit 1
case $stack_version_alias in
"8.previous"|"8.current"|"9.previous"|"9.current"|"9.next")
exit 99
;;
*)
exit 2
Expand All @@ -27,7 +27,7 @@ VERSION_URL="https://raw.githubusercontent.com/elastic/logstash/main/ci/logstash

if [ -z "${ELASTIC_STACK_VERSION}" ]; then
echo "Please set the ELASTIC_STACK_VERSION environment variable"
echo "For example: export ELASTIC_STACK_VERSION=7.x"
echo "For example: export ELASTIC_STACK_VERSION=9.x"
exit 1
fi

Expand All @@ -50,10 +50,10 @@ if [[ "$ELASTIC_STACK_RETRIEVED_VERSION" != "null" ]]; then
ELASTIC_STACK_RETRIEVED_VERSION="${ELASTIC_STACK_RETRIEVED_VERSION#\"}"
echo "Translated $ELASTIC_STACK_VERSION to ${ELASTIC_STACK_RETRIEVED_VERSION}"
export ELASTIC_STACK_VERSION=$ELASTIC_STACK_RETRIEVED_VERSION
elif [[ "$ELASTIC_STACK_VERSION" == "8.next" ]]; then
# we know "8.next" only exists between FF and GA of a minor
# exit 1 so the build is skipped
exit 1
elif [[ "$ELASTIC_STACK_VERSION" == "9.next" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think i may have missed a 9.next version in this elastic/logstash#17868 as it would always be main for the near future?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

next is a moniker we came up with to reference that short lived situation between the branching off of a new 9.x minor from main until its GA. e.g. once we hit 9.2.0 feature freeze we'll branch 9.2 from main, and have to deal with main, 9.2, 9.1 and 9.0 until 9.2 GA, where 9.2 becomes .current, 9.1 previous, and drop 9.0.
For this reason it's fine that next is often enough not real until it is, so we excuse its absence.

# we know "9.next" only exists between FF and GA of a minor
# exit 99 so the build is skipped
exit 99
fi

case "${DISTRIBUTION}" in
Expand Down
8 changes: 4 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ jobs:
- env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=7.current
- env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=8.previous
- env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=8.current
- env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=8.next
- env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.next
- env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.current
- env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=main
- stage: "Secure Integration Tests"
env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info ELASTIC_STACK_VERSION=7.current
Expand All @@ -22,5 +21,6 @@ jobs:
- env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.current
- env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.current ES_SSL_KEY_INVALID=true
- env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.current ES_SSL_SUPPORTED_PROTOCOLS=TLSv1.3
- env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=8.next
- env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=9.next
- env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=8.current
- env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=9.current
- env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=main
5 changes: 4 additions & 1 deletion spec/integration/outputs/metrics_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
require "logstash/outputs/elasticsearch"
settings = {
"manage_template" => false,
"hosts" => "#{get_host_port()}"
"hosts" => "#{get_host_port()}",
# write data to a random non templated index to ensure the bulk partially fails
# don't use streams like "logs-*" as those have failure stores enabled, causing the bulk to succeed instead
"index" => "custom_index_#{rand(10000)}"
}
plugin = LogStash::Outputs::ElasticSearch.new(settings)
end
Expand Down