From 12975a5a0c6846d5cdbecc73beceba0346cd866b Mon Sep 17 00:00:00 2001
From: Juan Pablo Djeredjian <jpdjeredjian@gmail.com>
Date: Tue, 24 Oct 2023 10:26:15 +0200
Subject: [PATCH] [Security Solution] Enable Serverless for `entity_analytics`
 Cypress tests (#169209)

## Summary

Running flaky test runner for
`x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics`

## Changes

-
`x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics/enrichments.cy.ts`
**unskipped whole test suite in favour of failing test -> `Custom Query
rule - from legacy risk scores`** (see below) **also enabled on
Serverless**
-
`x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics/entity_analytics_management_page.cy.ts`
**enabled on Serverless**

## Related failing-test issues

1. https://github.com/elastic/kibana/issues/169154
**Marked as legit-flake and assigned to
@elastic/security-detection-engine**

### Flaky test runner link

-
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/3575
---
 .../cypress/e2e/entity_analytics/enrichments.cy.ts         | 7 +++----
 .../entity_analytics_management_page.cy.ts                 | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics/enrichments.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics/enrichments.cy.ts
index b20db6868f9a0..f5716f33ff288 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics/enrichments.cy.ts
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics/enrichments.cy.ts
@@ -36,9 +36,7 @@ import { enableRiskEngine } from '../../tasks/entity_analytics';
 const CURRENT_HOST_RISK_LEVEL = 'Current host risk level';
 const ORIGINAL_HOST_RISK_LEVEL = 'Original host risk level';
 
-// TODO: https://github.com/elastic/kibana/issues/161539
-// FLAKY: https://github.com/elastic/kibana/issues/169154
-describe.skip('Enrichment', { tags: ['@ess', '@serverless', '@brokenInServerless'] }, () => {
+describe('Enrichment', { tags: ['@ess', '@serverless'] }, () => {
   before(() => {
     cleanKibana();
     cy.task('esArchiverUnload', 'risk_scores_new');
@@ -51,7 +49,8 @@ describe.skip('Enrichment', { tags: ['@ess', '@serverless', '@brokenInServerless
   });
 
   describe('Custom query rule', () => {
-    describe('from legacy risk scores', () => {
+    // FLAKY: https://github.com/elastic/kibana/issues/169154
+    describe.skip('from legacy risk scores', () => {
       beforeEach(() => {
         disableExpandableFlyout();
         cy.task('esArchiverLoad', { archiveName: 'risk_hosts' });
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics/entity_analytics_management_page.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics/entity_analytics_management_page.cy.ts
index 4f4cb0a505712..1e93f1fb21421 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics/entity_analytics_management_page.cy.ts
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics/entity_analytics_management_page.cy.ts
@@ -43,7 +43,7 @@ import {
 describe(
   'Entity analytics management page',
   {
-    tags: ['@ess', '@serverless', '@brokenInServerless'],
+    tags: ['@ess', '@serverless'],
   },
   () => {
     before(() => {