From 323e7cf0e6b05b384de804a8ae2fa76a7ac0ed6b Mon Sep 17 00:00:00 2001 From: Tomasz Ciecierski Date: Thu, 25 Apr 2024 08:42:58 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"[Cypress]=20Hardcode=20fleet=20server?= =?UTF-8?q?=208.13.0=20version=20in=20tests=20(#180=E2=80=A6=20(#181341)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 63a56dbabbc9aa4e79ceb50d41b8372264ce877f) --- .../plugins/security_solution/scripts/run_cypress/parallel.ts | 2 -- x-pack/test/osquery_cypress/fleet_server.ts | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts b/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts index 8522210a96478d..67cc7c743be114 100644 --- a/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts +++ b/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts @@ -343,8 +343,6 @@ ${JSON.stringify( fleetServer = await startFleetServer({ kbnClient, - // TODO TC: https://github.com/elastic/kibana/pull/180879 - there was an issue with 8.14.0, this should be removed when it's fixed - version: '8.13.0-SNAPSHOT', logger: log, port: fleetServerPort ?? config.has('servers.fleetserver.port') diff --git a/x-pack/test/osquery_cypress/fleet_server.ts b/x-pack/test/osquery_cypress/fleet_server.ts index 4d606d09e3ee77..264bf9f8698915 100644 --- a/x-pack/test/osquery_cypress/fleet_server.ts +++ b/x-pack/test/osquery_cypress/fleet_server.ts @@ -12,6 +12,7 @@ import { startFleetServer, } from '@kbn/security-solution-plugin/scripts/endpoint/common/fleet_server/fleet_server_services'; import { Manager } from './resource_manager'; +import { getLatestAvailableAgentVersion } from './utils'; export class FleetManager extends Manager { private fleetServer: StartedFleetServer | undefined = undefined; @@ -25,8 +26,7 @@ export class FleetManager extends Manager { } public async setup(): Promise { - // TODO TC: https://github.com/elastic/kibana/pull/180879 - there was an issue with 8.14.0, this should be removed when it's fixed - const version = '8.13.0-SNAPSHOT'; + const version = await getLatestAvailableAgentVersion(this.kbnClient); this.fleetServer = await startFleetServer({ kbnClient: this.kbnClient, logger: this.log,