Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 90 additions & 6 deletions .buildkite/pipelines/chrome_forward_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,57 @@ steps:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules.sh
label: 'Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_customization.sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: I think the cypress runner is actually not prepared for testing against chrome beta - at least not for now. I can't find where in the cypress config we prescribe the browser, but that should respect the USE_CHROME_BETA env variable. I'll approve this for now, because this PR is not concerning already existent states

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

after having looked into it, it seems the cypress parallel runner respects this flag - couldn't verify yet, if it's ultimately being used everywhere down the line, but https://github.com/elastic/kibana/blob/main/x-pack/solutions/security/plugins/security_solution/scripts/run_cypress/parallel_serverless.ts#L586 seems to be doing the right thing

label: 'Serverless Rule Management - Prebuilt Rules Customization - Security Solution Cypress Tests'
agents:
machineType: n2-standard-4
preemptible: true
depends_on:
- build
timeout_in_minutes: 60
parallelism: 2
parallelism: 1
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_installation.sh
label: 'Serverless Rule Management - Prebuilt Rules Installation - Security Solution Cypress Tests'
agents:
machineType: n2-standard-4
preemptible: true
depends_on:
- build
timeout_in_minutes: 60
parallelism: 1
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_management.sh
label: 'Serverless Rule Management - Prebuilt Rules Management - Security Solution Cypress Tests'
agents:
machineType: n2-standard-4
preemptible: true
depends_on:
- build
timeout_in_minutes: 60
parallelism: 1
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_upgrade.sh
label: 'Serverless Rule Management - Prebuilt Rules Upgrade - Security Solution Cypress Tests'
agents:
machineType: n2-standard-4
preemptible: true
depends_on:
- build
timeout_in_minutes: 60
parallelism: 1
retry:
automatic:
- exit_status: '-1'
Expand All @@ -145,15 +187,57 @@ steps:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules.sh
label: 'Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_customization.sh
label: 'Rule Management - Prebuilt Rules Customization - Security Solution Cypress Tests'
agents:
machineType: n2-standard-4
preemptible: true
depends_on:
- build
timeout_in_minutes: 60
parallelism: 2
parallelism: 1
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_installation.sh
label: 'Rule Management - Prebuilt Rules Installation - Security Solution Cypress Tests'
agents:
machineType: n2-standard-4
preemptible: true
depends_on:
- build
timeout_in_minutes: 60
parallelism: 1
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_management.sh
label: 'Rule Management - Prebuilt Rules Management - Security Solution Cypress Tests'
agents:
machineType: n2-standard-4
preemptible: true
depends_on:
- build
timeout_in_minutes: 60
parallelism: 1
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_upgrade.sh
label: 'Rule Management - Prebuilt Rules Upgrade - Security Solution Cypress Tests'
agents:
machineType: n2-standard-4
preemptible: true
depends_on:
- build
timeout_in_minutes: 60
parallelism: 1
retry:
automatic:
- exit_status: '-1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ steps:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules.sh
label: 'Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_customization.sh
label: 'Serverless Rule Management - Prebuilt Rules Customization - Security Solution Cypress Tests'
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
agents:
image: family/kibana-ubuntu-2004
Expand All @@ -141,7 +141,58 @@ steps:
preemptible: true
depends_on: build
timeout_in_minutes: 60
parallelism: 2
parallelism: 1
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_installation.sh
label: 'Serverless Rule Management - Prebuilt Rules Installation - Security Solution Cypress Tests'
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on: build
timeout_in_minutes: 60
parallelism: 1
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_management.sh
label: 'Serverless Rule Management - Prebuilt Rules Management - Security Solution Cypress Tests'
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on: build
timeout_in_minutes: 60
parallelism: 1
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_upgrade.sh
label: 'Serverless Rule Management - Prebuilt Rules Upgrade - Security Solution Cypress Tests'
if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
depends_on: build
timeout_in_minutes: 60
parallelism: 1
retry:
automatic:
- exit_status: '-1'
Expand Down
32 changes: 28 additions & 4 deletions .buildkite/pipelines/flaky_tests/groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,36 @@
"name": "[Serverless] Security Solution Rule Management - Cypress"
},
{
"key": "cypress/security_solution_rule_management_prebuilt_rules",
"name": "Security Solution Rule Management - Prebuilt Rules - Cypress"
"key": "cypress/security_solution_rule_management_prebuilt_rules_customization",
"name": "Security Solution Rule Management - Prebuilt Rules Customization - Cypress"
},
{
"key": "cypress/security_serverless_rule_management_prebuilt_rules",
"name": "[Serverless] Security Solution Rule Management - Prebuilt Rules - Cypress"
"key": "cypress/security_serverless_rule_management_prebuilt_rules_customization",
"name": "[Serverless] Security Solution Rule Management - Prebuilt Rules Customization - Cypress"
},
{
"key": "cypress/security_solution_rule_management_prebuilt_rules_installation",
"name": "Security Solution Rule Management - Prebuilt Rules Installation - Cypress"
},
{
"key": "cypress/security_serverless_rule_management_prebuilt_rules_installation",
"name": "[Serverless] Security Solution Rule Management - Prebuilt Rules Installation - Cypress"
},
{
"key": "cypress/security_solution_rule_management_prebuilt_rules_management",
"name": "Security Solution Rule Management - Prebuilt Rules Management - Cypress"
},
{
"key": "cypress/security_serverless_rule_management_prebuilt_rules_management",
"name": "[Serverless] Security Solution Rule Management - Prebuilt Rules Management - Cypress"
},
{
"key": "cypress/security_solution_rule_management_prebuilt_rules_upgrade",
"name": "Security Solution Rule Management - Prebuilt Rules Upgrade - Cypress"
},
{
"key": "cypress/security_serverless_rule_management_prebuilt_rules_upgrade",
"name": "[Serverless] Security Solution Rule Management - Prebuilt Rules Upgrade - Cypress"
},
{
"key": "cypress/security_solution_detection_engine",
Expand Down
100 changes: 95 additions & 5 deletions .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -238,16 +238,61 @@ steps:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules.sh
label: 'Serverless Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_customization.sh
label: 'Serverless Rule Management - Prebuilt Rules Customization - Security Solution Cypress Tests'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 60
parallelism: 2
parallelism: 1
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_installation.sh
label: 'Serverless Rule Management - Prebuilt Rules Installation - Security Solution Cypress Tests'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 60
parallelism: 1
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_management.sh
label: 'Serverless Rule Management - Prebuilt Rules Management - Security Solution Cypress Tests'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 60
parallelism: 1
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_rule_management_prebuilt_rules_upgrade.sh
label: 'Serverless Rule Management - Prebuilt Rules Upgrade - Security Solution Cypress Tests'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 60
parallelism: 1
retry:
automatic:
- exit_status: '-1'
Expand All @@ -268,8 +313,53 @@ steps:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules.sh
label: 'Rule Management - Prebuilt Rules - Security Solution Cypress Tests'
- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_customization.sh
label: 'Rule Management - Prebuilt Rules Customization - Security Solution Cypress Tests'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 60
parallelism: 2
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_installation.sh
label: 'Rule Management - Prebuilt Rules Installation - Security Solution Cypress Tests'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 60
parallelism: 2
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_management.sh
label: 'Rule Management - Prebuilt Rules Management - Security Solution Cypress Tests'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-4
preemptible: true
timeout_in_minutes: 60
parallelism: 2
retry:
automatic:
- exit_status: '-1'
limit: 1

- command: .buildkite/scripts/steps/functional/security_solution_rule_management_prebuilt_rules_upgrade.sh
label: 'Rule Management - Prebuilt Rules Upgrade - Security Solution Cypress Tests'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
Expand Down
Loading