From ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b Mon Sep 17 00:00:00 2001 From: Jen Huang Date: Wed, 9 Oct 2024 00:05:56 -0700 Subject: [PATCH] [UII] Adjust test based on ES version tested against (#195508) ## 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. --- .../apis/epm/install_overrides.ts | 89 ++++++++++--------- 1 file changed, 48 insertions(+), 41 deletions(-) diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts b/x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts index 50aafabd56d6f..4e184edc38387 100644 --- a/x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts +++ b/x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts @@ -120,56 +120,63 @@ export default function (providerContext: FtrProviderContext) { // omit routings delete body.template.settings.index.routing; - expect(body).to.eql({ - template: { - settings: { - index: { - default_pipeline: 'logs-overrides.test-0.1.0', - lifecycle: { - name: 'overridden by user', - }, - mapping: { - total_fields: { - limit: '1000', - }, + expect(Object.keys(body)).to.eql(['template', 'overlapping']); + expect(body.template).to.eql({ + settings: { + index: { + default_pipeline: 'logs-overrides.test-0.1.0', + lifecycle: { + name: 'overridden by user', + }, + mapping: { + total_fields: { + limit: '1000', }, - number_of_shards: '3', }, + number_of_shards: '3', }, - mappings: { - dynamic: 'false', - properties: { - '@timestamp': { - type: 'date', - }, - data_stream: { - properties: { - dataset: { - type: 'constant_keyword', - }, - namespace: { - type: 'constant_keyword', - }, - type: { - type: 'constant_keyword', - }, + }, + mappings: { + dynamic: 'false', + properties: { + '@timestamp': { + type: 'date', + }, + data_stream: { + properties: { + dataset: { + type: 'constant_keyword', + }, + namespace: { + type: 'constant_keyword', + }, + type: { + type: 'constant_keyword', }, }, }, }, - aliases: {}, }, - overlapping: [ - { - name: 'logs', - index_patterns: ['logs-*-*'], - }, - { - index_patterns: ['logs-*.otel-*'], - name: 'logs-otel@template', - }, - ], + 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', + }, + ] + : []), + ]); }); }); }