Skip to content

Commit

Permalink
[UII] Adjust test based on ES version tested against (#195508)
Browse files Browse the repository at this point in the history
## Summary

Follow up to #194764. This test was also failing on 7.17 branch when
they 8.x ES compatibility tests were run, so this PR adjusts the test
based on the ES version it runs against. This will be backported to 8.x
and 7.17.

(cherry picked from commit ab2d7aa)

# Conflicts:
#	x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts
  • Loading branch information
jen-huang committed Oct 9, 2024
1 parent 79fed6f commit c2a849c
Showing 1 changed file with 34 additions and 23 deletions.
57 changes: 34 additions & 23 deletions x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,34 +116,45 @@ export default function (providerContext: FtrProviderContext) {
// omit routings
delete body.template.settings.index.routing;

expect(body).to.eql({
template: {
settings: {
index: {
codec: 'best_compression',
lifecycle: {
name: 'overridden by user',
},
mapping: {
total_fields: {
limit: '10000',
},
expect(Object.keys(body)).to.eql(['template', 'overlapping']);
expect(body.template).to.eql({
settings: {
index: {
codec: 'best_compression',
lifecycle: {
name: 'overridden by user',
},
mapping: {
total_fields: {
limit: '10000',
},
number_of_shards: '3',
},
number_of_shards: '3',
},
mappings: {
dynamic: 'false',
},
aliases: {},
},
overlapping: [
{
name: 'logs',
index_patterns: ['logs-*-*'],
},
],
mappings: {
dynamic: 'false',
},
aliases: {},
});

// otel logs templates were added in 8.16 but these tests also run against
// previous versions, so we conditionally test based on the ES version
const esVersion = getService('esVersion');
expect(body.overlapping).to.eql([
{
name: 'logs',
index_patterns: ['logs-*-*'],
},
...(esVersion.matchRange('>=8.16.0')
? [
{
index_patterns: ['logs-*.otel-*'],
name: 'logs-otel@template',
},
]
: []),
]);
});
});
}

0 comments on commit c2a849c

Please sign in to comment.