From ffc3467d5024d7bdc5180a1bc75e2304d4bf717f Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Thu, 25 Apr 2024 04:02:20 -0400
Subject: [PATCH] =?UTF-8?q?[8.14]=20Revert=20&quot;[Cypress]=20Hardcode=20?=
 =?UTF-8?q?fleet=20server=208.13.0=20version=20in=20tests=20(#180=E2=80=A6?=
 =?UTF-8?q?=20(#181341)=20(#181652)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Backport

This will backport the following commits from `main` to `8.14`:
- [Revert &quot;[Cypress] Hardcode fleet server 8.13.0 version in tests
(#180… (#181341)](https://github.com/elastic/kibana/pull/181341)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Tomasz
Ciecierski","email":"tomasz.ciecierski@elastic.co"},"sourceCommit":{"committedDate":"2024-04-25T06:42:58Z","message":"Revert
\"[Cypress] Hardcode fleet server 8.13.0 version in tests (#180…
(#181341)","sha":"63a56dbabbc9aa4e79ceb50d41b8372264ce877f","branchLabelMapping":{"^v8.15.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v8.14.0","v8.15.0"],"title":"Revert
\"[Cypress] Hardcode fleet server 8.13.0 version in tests
(#180…","number":181341,"url":"https://github.com/elastic/kibana/pull/181341","mergeCommit":{"message":"Revert
\"[Cypress] Hardcode fleet server 8.13.0 version in tests (#180…
(#181341)","sha":"63a56dbabbc9aa4e79ceb50d41b8372264ce877f"}},"sourceBranch":"main","suggestedTargetBranches":["8.14"],"targetPullRequestStates":[{"branch":"8.14","label":"v8.14.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.15.0","branchLabelMappingKey":"^v8.15.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/181341","number":181341,"mergeCommit":{"message":"Revert
\"[Cypress] Hardcode fleet server 8.13.0 version in tests (#180…
(#181341)","sha":"63a56dbabbc9aa4e79ceb50d41b8372264ce877f"}}]}]
BACKPORT-->

Co-authored-by: Tomasz Ciecierski <tomasz.ciecierski@elastic.co>
---
 .../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<void> {
-    // 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,