From 3027eb1c85f73d3194b6c5c8a4a8958f6775b445 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Tue, 29 Oct 2024 01:04:10 +1100
Subject: [PATCH] [8.x] [EDR Workflows] Enable Blocklist CY in MKI (#197952)
 (#197984)
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.x`:
- [[EDR Workflows] Enable Blocklist CY in MKI
(#197952)](https://github.com/elastic/kibana/pull/197952)

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

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

<!--BACKPORT [{"author":{"name":"Konrad
Szwarc","email":"konrad.szwarc@elastic.co"},"sourceCommit":{"committedDate":"2024-10-28T12:18:28Z","message":"[EDR
Workflows] Enable Blocklist CY in MKI (#197952)\n\nSince adding this
test file was tied to changes in Kibana, we initially\r\ncouldn’t enable
it in the MKI. The MKI relies on a Kibana image built\r\nfrom the main
branch, and at that time, the necessary changes for these\r\ntests to
pass hadn’t yet been merged. Now that these updates are\r\nincluded in
the main branch, the Kibana image used in MKI has the\r\nrequired
changes, so we can proceed with enabling the tests.\r\n\r\nManual MKI
run
-\r\nhttps://buildkite.com/elastic/kibana-serverless-security-solution-quality-gate-defend-workflows/builds/1545","sha":"7865045f413533c9685c59df4ae02f6a8875a918","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:Defend
Workflows","backport:version","v8.17.0"],"title":"[EDR Workflows] Enable
Blocklist CY in
MKI","number":197952,"url":"https://github.com/elastic/kibana/pull/197952","mergeCommit":{"message":"[EDR
Workflows] Enable Blocklist CY in MKI (#197952)\n\nSince adding this
test file was tied to changes in Kibana, we initially\r\ncouldn’t enable
it in the MKI. The MKI relies on a Kibana image built\r\nfrom the main
branch, and at that time, the necessary changes for these\r\ntests to
pass hadn’t yet been merged. Now that these updates are\r\nincluded in
the main branch, the Kibana image used in MKI has the\r\nrequired
changes, so we can proceed with enabling the tests.\r\n\r\nManual MKI
run
-\r\nhttps://buildkite.com/elastic/kibana-serverless-security-solution-quality-gate-defend-workflows/builds/1545","sha":"7865045f413533c9685c59df4ae02f6a8875a918"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/197952","number":197952,"mergeCommit":{"message":"[EDR
Workflows] Enable Blocklist CY in MKI (#197952)\n\nSince adding this
test file was tied to changes in Kibana, we initially\r\ncouldn’t enable
it in the MKI. The MKI relies on a Kibana image built\r\nfrom the main
branch, and at that time, the necessary changes for these\r\ntests to
pass hadn’t yet been merged. Now that these updates are\r\nincluded in
the main branch, the Kibana image used in MKI has the\r\nrequired
changes, so we can proceed with enabling the tests.\r\n\r\nManual MKI
run
-\r\nhttps://buildkite.com/elastic/kibana-serverless-security-solution-quality-gate-defend-workflows/builds/1545","sha":"7865045f413533c9685c59df4ae02f6a8875a918"}},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Konrad Szwarc <konrad.szwarc@elastic.co>
---
 .../public/management/cypress/e2e/artifacts/blocklist.cy.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/security_solution/public/management/cypress/e2e/artifacts/blocklist.cy.ts b/x-pack/plugins/security_solution/public/management/cypress/e2e/artifacts/blocklist.cy.ts
index 32dad9b0bbc0d..f0d3eb96e4581 100644
--- a/x-pack/plugins/security_solution/public/management/cypress/e2e/artifacts/blocklist.cy.ts
+++ b/x-pack/plugins/security_solution/public/management/cypress/e2e/artifacts/blocklist.cy.ts
@@ -41,7 +41,7 @@ const {
 describe(
   'Blocklist',
   {
-    tags: ['@ess', '@serverless', '@skipInServerlessMKI'], // @skipInServerlessMKI until kibana is rebuilt after merge
+    tags: ['@ess', '@serverless'],
   },
   () => {
     let indexedPolicy: IndexedFleetEndpointPolicyResponse;