Update build scripts to support downloading ES >= 6.3 #799
Conversation
Update travis build target Update artifact downloads to pull oss and standard versions of Elasticsearch when version >= 6.3.0
.travis.yml
Outdated
| @@ -8,9 +8,13 @@ env: | |||
| - INTEGRATION=true ES_VERSION=2.4.4 TEST_DEBUG=true | |||
| - INTEGRATION=true ES_VERSION=5.6.9 TEST_DEBUG=true | |||
| - INTEGRATION=true ES_VERSION=6.2.4 TEST_DEBUG=true | |||
| - OSS=true INTEGRATION=true ES_VERSION=6.4.2 TEST_DEBUG=true | |||
There was a problem hiding this comment.
what if we instead only tested against the latest 2.x, 5.x, 6.x and master?
This way we only need to install x-pack on 5.x
There was a problem hiding this comment.
@jsvd Makes sense - I wasn't sure if there was any value in keeping around the last version of 6.x before x-pack was opened up, but I think you're right that there isn't really.
There was a problem hiding this comment.
also, taking it a bit further, I see no obvious value of testing OSS=true, when it is a subset of OSS=false, thoughts?
There was a problem hiding this comment.
Yeah, I've still got a little clean up to do here - not quite ready for formal review. Early PR was to get tests running on Travis in case that I might have missed locally.
There was a problem hiding this comment.
But thanks for the early feedback ;)
Adds a DISTRIBUTION environment variable, which can be: legacy: OSS < 6.3 legacyxpack: < 6.3 with xpack plugin oss: OSS >= 6.3 default: standard distribution >= 6.3 Removes the exclusion filter for `secure_integration` - this was stopping secure integration tests from running even with tags on Updates logstash branch to 6.4
robbavey
force-pushed
the
build_updates
branch
from
3c45ae5 to
cf9ff83
Compare
Later versions of Elasticsearch require a later version of Gradle in order to build
Build the client, and set the mocks on that client before calling register to avoid race conditions
| - DISTRIBUTION=legacy INTEGRATION=true ES_VERSION=1.7.6 TEST_DEBUG=true | ||
| - DISTRIBUTION=legacy INTEGRATION=true ES_VERSION=2.4.4 TEST_DEBUG=true | ||
| - DISTRIBUTION=legacy INTEGRATION=true ES_VERSION=5.6.9 TEST_DEBUG=true | ||
| - DISTRIBUTION=oss INTEGRATION=true ES_VERSION=6.4.2 TEST_DEBUG=true |
There was a problem hiding this comment.
If we removed oss testing (only testing the default package) then we could likely get rid of the whole DISTRIBUTION environment variable, since
- legacy means < 6.3.0
- legacyxpack means < 6.3.0 + xpack (which we know we need because of SECURE_INTEGRATION=true)
- default >= 6.3.0
There was a problem hiding this comment.
I wanted to have the OSS testing for ILM when it comes - as it is an xpack feature, there will be different tests for open source and xpack flavours of elasticsearch
There was a problem hiding this comment.
testing the oss won't give us more information as it's a subset of the codebase of the default distro
There was a problem hiding this comment.
oops, I only now read your comment, got it, makes sense.
There was a problem hiding this comment.
LGTM, please squash before/during merging.
In a near future it'd be nice to improve how testing is done in travis by not using the logstash source, only the tarball (or docker image), and separating the setup part and running tests part, like we do in tcp input: https://github.com/logstash-plugins/logstash-input-tcp/blob/master/.travis.yml#L7-L8
|
Thanks @jsvd. I'll do a follow up PR to fix up the rest to make it look more like the tcp input |
Update travis build target
Update artifact downloads to pull oss and standard versions of
Elasticsearch when version >= 6.3.0
Fixes tests to actually run secure integration tests
Updates version of gradle used to build master version of Elasticsearch
Fixes flaky tests