Skip to content

Cherry-pick #9198 to 6.x: Upgrade test Docker images to latest versions#9734

Merged
ycombinator merged 2 commits intoelastic:6.xfrom
ycombinator:backport_9198_6.x
Dec 21, 2018
Merged

Cherry-pick #9198 to 6.x: Upgrade test Docker images to latest versions#9734
ycombinator merged 2 commits intoelastic:6.xfrom
ycombinator:backport_9198_6.x

Conversation

@ycombinator
Copy link
Copy Markdown
Contributor

Cherry-pick of PR #9198 to 6.x branch. Original message:

This PR upgrades the Elasticsearch and Kibana Docker images to their latest versions in their respective Metricbeat module tests.

In addition to the actual version upgrade changes, this PR also contains several changes necessary to get the integration and system tests for the elasticsearch/ccr metricset passing. These tests existed before this PR but were skipped because:

  • the CCR feature only exists in Elasticsearch 6.5.0 onwards,
  • the tests had a check to skip if the version of Elasticsearch being used in the tests was < 6.5.0, and
  • we were using Elasticsearch 6.4.3 until this PR came along and upgraded it.

* Upgrade to latest versions

* Fixing integration test by setting up CCR stats

* Adding test fixtures

* Renaming per hound suggestion

* Start trial for all metricsets

* Create CCR stats first!

* Fix formatting issues

* Refactoring to reuse ES client

* [WIP] Testing if this is a timing issue

* Fixing formatting

* WIP: Make container health check use GET /_xpack/license

* Removing test sleep

* Trying a more generic health check

(cherry picked from commit ecc09cc)
@ycombinator
Copy link
Copy Markdown
Contributor Author

The metricbeat system tests are failing on this PR because I made a mistake merging the original PR (#9198) into master prematurely. I'm fixing that mistake in master via #9749 now. Once that PR is merged, I'll cherrypick its commit into this PR.

@ycombinator ycombinator merged commit cf6e60f into elastic:6.x Dec 21, 2018
@ycombinator ycombinator deleted the backport_9198_6.x branch December 25, 2019 11:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants