From 02a43a1dd027863dc7f8458624e8513c3b5628ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Kopyci=C5=84ski?= Date: Mon, 31 Jul 2023 15:42:45 +0200 Subject: [PATCH] Adjust cypress jobs config (#162729) ## Summary Adjust cypress buildkite job configs --------- Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .buildkite/pipelines/pull_request/defend_workflows.yml | 4 ---- .buildkite/pipelines/pull_request/osquery_cypress.yml | 2 -- .buildkite/pipelines/pull_request/response_ops.yml | 4 ++-- .buildkite/pipelines/pull_request/response_ops_cases.yml | 4 ++-- .buildkite/pipelines/pull_request/security_solution.yml | 8 ++++---- .../pipelines/pull_request/security_solution_explore.yml | 6 +++--- .../pull_request/security_solution_investigations.yml | 6 +++--- .buildkite/pipelines/pull_request/threat_intelligence.yml | 4 +--- .buildkite/scripts/steps/functional/security_solution.sh | 2 +- .../scripts/steps/functional/threat_intelligence.sh | 2 +- .../security_solution/scripts/run_cypress/parallel.ts | 2 +- 11 files changed, 18 insertions(+), 26 deletions(-) diff --git a/.buildkite/pipelines/pull_request/defend_workflows.yml b/.buildkite/pipelines/pull_request/defend_workflows.yml index 22be5122727bf..02f9239a8e6a2 100644 --- a/.buildkite/pipelines/pull_request/defend_workflows.yml +++ b/.buildkite/pipelines/pull_request/defend_workflows.yml @@ -8,8 +8,6 @@ steps: parallelism: 2 retry: automatic: - - exit_status: '-1' - limit: 3 - exit_status: '*' limit: 1 artifact_paths: @@ -24,8 +22,6 @@ steps: parallelism: 6 retry: automatic: - - exit_status: '-1' - limit: 3 - exit_status: '*' limit: 1 artifact_paths: diff --git a/.buildkite/pipelines/pull_request/osquery_cypress.yml b/.buildkite/pipelines/pull_request/osquery_cypress.yml index 15d3330f75c56..4eefffdf7ee06 100644 --- a/.buildkite/pipelines/pull_request/osquery_cypress.yml +++ b/.buildkite/pipelines/pull_request/osquery_cypress.yml @@ -8,8 +8,6 @@ steps: parallelism: 6 retry: automatic: - - exit_status: '-1' - limit: 3 - exit_status: '*' limit: 1 artifact_paths: diff --git a/.buildkite/pipelines/pull_request/response_ops.yml b/.buildkite/pipelines/pull_request/response_ops.yml index 2f71568f38cb5..b2ef5199fab91 100644 --- a/.buildkite/pipelines/pull_request/response_ops.yml +++ b/.buildkite/pipelines/pull_request/response_ops.yml @@ -8,7 +8,7 @@ steps: parallelism: 4 retry: automatic: - - exit_status: '-1' - limit: 3 - exit_status: '*' limit: 1 + artifact_paths: + - "target/kibana-security-solution/**/*" diff --git a/.buildkite/pipelines/pull_request/response_ops_cases.yml b/.buildkite/pipelines/pull_request/response_ops_cases.yml index 84497c953afc7..af2e58b65ab34 100644 --- a/.buildkite/pipelines/pull_request/response_ops_cases.yml +++ b/.buildkite/pipelines/pull_request/response_ops_cases.yml @@ -7,7 +7,7 @@ steps: timeout_in_minutes: 120 retry: automatic: - - exit_status: '-1' - limit: 3 - exit_status: '*' limit: 1 + artifact_paths: + - "target/kibana-security-solution/**/*" diff --git a/.buildkite/pipelines/pull_request/security_solution.yml b/.buildkite/pipelines/pull_request/security_solution.yml index 6002756c8889d..a30609ac5ca21 100644 --- a/.buildkite/pipelines/pull_request/security_solution.yml +++ b/.buildkite/pipelines/pull_request/security_solution.yml @@ -1,14 +1,14 @@ steps: - command: .buildkite/scripts/steps/functional/security_solution.sh - label: 'Security Solution Tests' + label: 'Security Solution Cypress Tests' agents: queue: n2-4-spot depends_on: build timeout_in_minutes: 60 - parallelism: 7 + parallelism: 10 retry: automatic: - - exit_status: '-1' - limit: 3 - exit_status: '*' limit: 1 + artifact_paths: + - "target/kibana-security-solution/**/*" diff --git a/.buildkite/pipelines/pull_request/security_solution_explore.yml b/.buildkite/pipelines/pull_request/security_solution_explore.yml index 1ab77db5b4cfc..3ff38c0e012f5 100644 --- a/.buildkite/pipelines/pull_request/security_solution_explore.yml +++ b/.buildkite/pipelines/pull_request/security_solution_explore.yml @@ -1,6 +1,6 @@ steps: - command: .buildkite/scripts/steps/functional/security_solution_explore.sh - label: 'Explore - Security Solution Tests' + label: 'Explore - Security Solution Cypress Tests' agents: queue: n2-4-spot depends_on: build @@ -8,7 +8,7 @@ steps: parallelism: 2 retry: automatic: - - exit_status: '-1' - limit: 3 - exit_status: '*' limit: 1 + artifact_paths: + - "target/kibana-security-solution/**/*" diff --git a/.buildkite/pipelines/pull_request/security_solution_investigations.yml b/.buildkite/pipelines/pull_request/security_solution_investigations.yml index 7ec4efb5f2a9e..395055db922a8 100644 --- a/.buildkite/pipelines/pull_request/security_solution_investigations.yml +++ b/.buildkite/pipelines/pull_request/security_solution_investigations.yml @@ -1,6 +1,6 @@ steps: - command: .buildkite/scripts/steps/functional/security_solution_investigations.sh - label: 'Investigations - Security Solution Tests' + label: 'Investigations - Security Solution Cypress Tests' agents: queue: n2-4-spot depends_on: build @@ -8,7 +8,7 @@ steps: parallelism: 4 retry: automatic: - - exit_status: '-1' - limit: 3 - exit_status: '*' limit: 1 + artifact_paths: + - "target/kibana-security-solution/**/*" diff --git a/.buildkite/pipelines/pull_request/threat_intelligence.yml b/.buildkite/pipelines/pull_request/threat_intelligence.yml index 9a16eb9527882..f9b9050d28d95 100644 --- a/.buildkite/pipelines/pull_request/threat_intelligence.yml +++ b/.buildkite/pipelines/pull_request/threat_intelligence.yml @@ -1,6 +1,6 @@ steps: - command: .buildkite/scripts/steps/functional/threat_intelligence.sh - label: 'Threat Intelligence Tests' + label: 'Threat Intelligence Cypress Tests' agents: queue: n2-4-spot depends_on: build @@ -8,8 +8,6 @@ steps: parallelism: 2 retry: automatic: - - exit_status: '-1' - limit: 3 - exit_status: '*' limit: 1 artifact_paths: diff --git a/.buildkite/scripts/steps/functional/security_solution.sh b/.buildkite/scripts/steps/functional/security_solution.sh index f021cdc7c8fc3..5890b463f7735 100755 --- a/.buildkite/scripts/steps/functional/security_solution.sh +++ b/.buildkite/scripts/steps/functional/security_solution.sh @@ -8,6 +8,6 @@ source .buildkite/scripts/steps/functional/common_cypress.sh export JOB=kibana-security-solution-chrome export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION} -echo "--- Security Solution tests (Chrome)" +echo "--- Security Solution Cypress tests (Chrome)" yarn --cwd x-pack/plugins/security_solution cypress:run diff --git a/.buildkite/scripts/steps/functional/threat_intelligence.sh b/.buildkite/scripts/steps/functional/threat_intelligence.sh index c07ea8605c2d0..0c2c80942e7c6 100755 --- a/.buildkite/scripts/steps/functional/threat_intelligence.sh +++ b/.buildkite/scripts/steps/functional/threat_intelligence.sh @@ -8,6 +8,6 @@ source .buildkite/scripts/steps/functional/common_cypress.sh export JOB=kibana-threat-intelligence-chrome export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION} -echo "--- Threat Intelligence tests (Chrome)" +echo "--- Threat Intelligence Cypress tests (Chrome)" yarn --cwd x-pack/plugins/threat_intelligence cypress:run diff --git a/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts b/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts index 5b4da6dcf3daf..bbabfc8bbd0e1 100644 --- a/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts +++ b/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts @@ -327,7 +327,7 @@ export const cli = () => { concurrency: (argv.concurrency as number | undefined) ? (argv.concurrency as number) : !isOpen - ? 3 + ? 2 : 1, } ).then((results) => {