Skip to content

Commit

Permalink
[8.11] [Security Solution] Unskip misc rule management Serverless Cyp…
Browse files Browse the repository at this point in the history
…ress tests (#168305) (#168408)

# Backport

This will backport the following commits from `main` to `8.11`:
- [[Security Solution] Unskip misc rule management Serverless Cypress
tests (#168305)](#168305)

<!--- Backport version: 8.9.7 -->

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

<!--BACKPORT [{"author":{"name":"Maxim
Palenov","email":"maxim.palenov@elastic.co"},"sourceCommit":{"committedDate":"2023-10-09T20:33:22Z","message":"[Security
Solution] Unskip misc rule management Serverless Cypress tests
(#168305)\n\n**Addresses:**
https://github.com/elastic/kibana/issues/161540\r\n\r\n##
Summary\r\n\r\nThis PR unskips miscelanious (not falling in one category
but unskipping\r\neach one separately is overkill) rule management
Serverless Cypress\r\ntests\r\n\r\n-
`maintenance_window_callout.cy.ts`\r\n-
`related_integrations.cy.ts`\r\n- `rule_delete.cy.ts`\r\n-
`rule_snoozing.cy.ts`\r\n \r\n## Flaky test
runner\r\n\r\n\r\nhttps://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/3405\r\n150
runs
🟢","sha":"b7116b1efb96f0cedd8afb6529b8186a9ccdaff2","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["test","release_note:skip","Team:Detections
and Resp","Team: SecuritySolution","Team:Detection Rule
Management","v8.11.0","v8.12.0"],"number":168305,"url":"https://github.com/elastic/kibana/pull/168305","mergeCommit":{"message":"[Security
Solution] Unskip misc rule management Serverless Cypress tests
(#168305)\n\n**Addresses:**
https://github.com/elastic/kibana/issues/161540\r\n\r\n##
Summary\r\n\r\nThis PR unskips miscelanious (not falling in one category
but unskipping\r\neach one separately is overkill) rule management
Serverless Cypress\r\ntests\r\n\r\n-
`maintenance_window_callout.cy.ts`\r\n-
`related_integrations.cy.ts`\r\n- `rule_delete.cy.ts`\r\n-
`rule_snoozing.cy.ts`\r\n \r\n## Flaky test
runner\r\n\r\n\r\nhttps://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/3405\r\n150
runs
🟢","sha":"b7116b1efb96f0cedd8afb6529b8186a9ccdaff2"}},"sourceBranch":"main","suggestedTargetBranches":["8.11"],"targetPullRequestStates":[{"branch":"8.11","label":"v8.11.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/168305","number":168305,"mergeCommit":{"message":"[Security
Solution] Unskip misc rule management Serverless Cypress tests
(#168305)\n\n**Addresses:**
https://github.com/elastic/kibana/issues/161540\r\n\r\n##
Summary\r\n\r\nThis PR unskips miscelanious (not falling in one category
but unskipping\r\neach one separately is overkill) rule management
Serverless Cypress\r\ntests\r\n\r\n-
`maintenance_window_callout.cy.ts`\r\n-
`related_integrations.cy.ts`\r\n- `rule_delete.cy.ts`\r\n-
`rule_snoozing.cy.ts`\r\n \r\n## Flaky test
runner\r\n\r\n\r\nhttps://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/3405\r\n150
runs 🟢","sha":"b7116b1efb96f0cedd8afb6529b8186a9ccdaff2"}}]}]
BACKPORT-->

Co-authored-by: Maxim Palenov <maxim.palenov@elastic.co>
  • Loading branch information
kibanamachine and maximpn authored Oct 9, 2023
1 parent ce4342e commit 92de885
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ import { login } from '../../../../tasks/login';
import { visit } from '../../../../tasks/navigation';
import { RULES_MANAGEMENT_URL } from '../../../../urls/rules_management';

// TODO: https://github.com/elastic/kibana/issues/161540
describe(
'Maintenance window callout on Rule Management page',
{ tags: ['@ess', '@serverless', '@skipInServerless'] },
{ tags: ['@ess', '@serverless'] },
() => {
let maintenanceWindowId = '';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ import {
waitForPageToBeLoaded,
} from '../../../../tasks/rule_details';

// TODO: https://github.com/elastic/kibana/issues/161540
describe('Related integrations', { tags: ['@ess', '@serverless', '@brokenInServerless'] }, () => {
describe('Related integrations', { tags: ['@ess', '@serverless'] }, () => {
const DATA_STREAM_NAME = 'logs-related-integrations-test';
const PREBUILT_RULE_NAME = 'Prebuilt rule with related integrations';
const RULE_RELATED_INTEGRATIONS: IntegrationDefinition[] = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { createRule, findAllRules } from '../../../../../tasks/api_calls/rules';
import { deleteAlertsAndRules } from '../../../../../tasks/common';
import { login } from '../../../../../tasks/login';

describe('Rule deletion', { tags: ['@ess', '@serverless', '@skipInServerless'] }, () => {
describe('Rule deletion', { tags: ['@ess', '@serverless'] }, () => {
const testRules = [
getNewRule({ rule_id: 'rule1', name: 'Rule 1', enabled: false }),
getNewRule({ rule_id: 'rule2', name: 'Rule 2', enabled: false }),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ import { TOOLTIP } from '../../../../../screens/common';

const RULES_TO_IMPORT_FILENAME = 'cypress/fixtures/7_16_rules.ndjson';

// TODO: https://github.com/elastic/kibana/issues/161540
// Flaky in serverless tests
describe('rule snoozing', { tags: ['@ess', '@serverless', '@skipInServerless'] }, () => {
describe('rule snoozing', { tags: ['@ess', '@serverless'] }, () => {
before(() => {
cleanKibana();
});
Expand Down

0 comments on commit 92de885

Please sign in to comment.