From 49d6bc19a87a80a3309a57f9dedf9f44d3b2ea2e Mon Sep 17 00:00:00 2001 From: Tomasz Ciecierski Date: Tue, 16 Apr 2024 10:11:20 +0200 Subject: [PATCH 1/3] test 8.13.0 fs --- x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts | 1 + 1 file changed, 1 insertion(+) 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 67cc7c743be11..33cacf8ddcc2c 100644 --- a/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts +++ b/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts @@ -343,6 +343,7 @@ ${JSON.stringify( fleetServer = await startFleetServer({ kbnClient, + version: '8.13.0-SNAPSHOT', logger: log, port: fleetServerPort ?? config.has('servers.fleetserver.port') From 9c49beeb0aba42c550334371896bb534933df2ba Mon Sep 17 00:00:00 2001 From: Tomasz Ciecierski Date: Tue, 16 Apr 2024 11:00:48 +0200 Subject: [PATCH 2/3] osquery fs 8.13.0 --- x-pack/test/osquery_cypress/fleet_server.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/x-pack/test/osquery_cypress/fleet_server.ts b/x-pack/test/osquery_cypress/fleet_server.ts index 264bf9f869891..a3821b12d7dd8 100644 --- a/x-pack/test/osquery_cypress/fleet_server.ts +++ b/x-pack/test/osquery_cypress/fleet_server.ts @@ -12,7 +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'; +// import { getLatestAvailableAgentVersion } from './utils'; export class FleetManager extends Manager { private fleetServer: StartedFleetServer | undefined = undefined; @@ -26,7 +26,8 @@ export class FleetManager extends Manager { } public async setup(): Promise { - const version = await getLatestAvailableAgentVersion(this.kbnClient); + const version = '8.13.0-SNAPSHOT'; + // const version = await getLatestAvailableAgentVersion(this.kbnClient); this.fleetServer = await startFleetServer({ kbnClient: this.kbnClient, logger: this.log, From 270d64a8dae2783f883493d634ff98abf2c88961 Mon Sep 17 00:00:00 2001 From: Tomasz Ciecierski Date: Tue, 16 Apr 2024 11:41:11 +0200 Subject: [PATCH 3/3] comments --- .../plugins/security_solution/scripts/run_cypress/parallel.ts | 1 + x-pack/test/osquery_cypress/fleet_server.ts | 3 +-- 2 files changed, 2 insertions(+), 2 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 33cacf8ddcc2c..8522210a96478 100644 --- a/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts +++ b/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts @@ -343,6 +343,7 @@ ${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: diff --git a/x-pack/test/osquery_cypress/fleet_server.ts b/x-pack/test/osquery_cypress/fleet_server.ts index a3821b12d7dd8..4d606d09e3ee7 100644 --- a/x-pack/test/osquery_cypress/fleet_server.ts +++ b/x-pack/test/osquery_cypress/fleet_server.ts @@ -12,7 +12,6 @@ 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; @@ -26,8 +25,8 @@ 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,