Skip to content

Commit

Permalink
[8.14] Revert "[Cypress] Hardcode fleet server 8.13.0 version in…
Browse files Browse the repository at this point in the history
… tests (#180… (#181341) (#181652)

# Backport

This will backport the following commits from `main` to `8.14`:
- [Revert "[Cypress] Hardcode fleet server 8.13.0 version in tests
(#180… (#181341)](#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":"[email protected]"},"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 <[email protected]>
  • Loading branch information
kibanamachine and tomsonpl authored Apr 25, 2024
1 parent d4c95f6 commit ffc3467
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/osquery_cypress/fleet_server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand Down

0 comments on commit ffc3467

Please sign in to comment.