Skip to content

Commit 022130b

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into 158925-disable-infra-in-serverless-projets
2 parents 8e09ff4 + b6d6f60 commit 022130b

968 files changed

Lines changed: 34391 additions & 5594 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/ftr_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ enabled:
171171
- x-pack/test/alerting_api_integration/security_and_spaces/group1/config.ts
172172
- x-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts
173173
- x-pack/test/alerting_api_integration/security_and_spaces/group3/config.ts
174+
- x-pack/test/alerting_api_integration/security_and_spaces/group3/config_with_schedule_circuit_breaker.ts
174175
- x-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts
175176
- x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/config.ts
176177
- x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/config.ts

‎.buildkite/scripts/pipelines/pull_request/pipeline.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ const uploadPipeline = (pipelineContent: string | object) => {
141141
) {
142142
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/fleet_cypress.yml'));
143143
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/defend_workflows.yml'));
144+
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/osquery_cypress.yml'));
144145
}
145146

146147
if (

‎.buildkite/scripts/steps/functional/defend_workflows.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ echo "--- Defend Workflows Cypress tests"
1313
cd x-pack/plugins/security_solution
1414

1515
set +e
16-
yarn cypress:dw:run; status=$?; yarn junit:merge && exit $status
16+
yarn cypress:dw:run; status=$?; yarn junit:merge || :; exit $status

‎.buildkite/scripts/steps/functional/defend_workflows_vagrant.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ echo "--- Defend Workflows Endpoint Cypress tests"
1313
cd x-pack/plugins/security_solution
1414

1515
set +e
16-
yarn cypress:dw:endpoint:run; status=$?; yarn junit:merge && exit $status
16+
yarn cypress:dw:endpoint:run; status=$?; yarn junit:merge || :; exit $status

‎.buildkite/scripts/steps/functional/response_ops.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ echo "--- Response Ops Cypress Tests on Security Solution"
1313
cd x-pack/test/security_solution_cypress
1414

1515
set +e
16-
yarn cypress:run:respops:ess; status=$?; yarn junit:merge && exit $status
16+
yarn cypress:run:respops:ess; status=$?; yarn junit:merge || :; exit $status

‎.buildkite/scripts/steps/functional/response_ops_cases.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ echo "--- Response Ops Cases Cypress Tests on Security Solution"
1313
cd x-pack/test/security_solution_cypress
1414

1515
set +e
16-
yarn cypress:run:cases:ess; status=$?; yarn junit:merge && exit $status
16+
yarn cypress:run:cases:ess; status=$?; yarn junit:merge || :; exit $status

‎.buildkite/scripts/steps/functional/security_serverless.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ echo "--- Security Serverless Cypress Tests"
1313
cd x-pack/test/security_solution_cypress
1414

1515
set +e
16-
yarn cypress:run:serverless; status=$?; yarn junit:merge && exit $status
16+
yarn cypress:run:serverless; status=$?; yarn junit:merge || :; exit $status

‎.buildkite/scripts/steps/functional/security_serverless_explore.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ echo "--- Explore - Security Solution Cypress Tests"
1313
cd x-pack/test/security_solution_cypress
1414

1515
set +e
16-
yarn cypress:explore:run:serverless; status=$?; yarn junit:merge && exit $status
16+
yarn cypress:explore:run:serverless; status=$?; yarn junit:merge || :; exit $status

‎.buildkite/scripts/steps/functional/security_serverless_investigations.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ echo "--- Investigations Cypress Tests on Serverless"
1313
cd x-pack/test/security_solution_cypress
1414

1515
set +e
16-
yarn cypress:investigations:run:serverless; status=$?; yarn junit:merge && exit $status
16+
yarn cypress:investigations:run:serverless; status=$?; yarn junit:merge || :; exit $status

‎.buildkite/scripts/steps/functional/security_solution.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ echo "--- Security Solution Cypress tests (Chrome)"
1313
cd x-pack/test/security_solution_cypress
1414

1515
set +e
16-
yarn cypress:run:ess; status=$?; yarn junit:merge && exit $status
16+
yarn cypress:run:ess; status=$?; yarn junit:merge || :; exit $status

0 commit comments

Comments
 (0)