Skip to content

Commit

Permalink
[ci] Synchronize serverless tests between pipelines (#167934)
Browse files Browse the repository at this point in the history
We're running serverless cypress tests in three locations

1) on-merge
2) pull requests
3) verifying the latest elasticsearch snapshot

These have diverged slightly, causing a small issue where we missed
timeouts in pull requests due to a longer timeout in on-merge (which
triggers our notifications).

Timeouts are all set to 60 minutes. Target time is 40 minutes, with a 20
minute buffer that we can use to increase the parallelism as needed.
  • Loading branch information
jbudz committed Oct 3, 2023
1 parent d0c9f37 commit 39c9888
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ steps:
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 40
timeout_in_minutes: 60
parallelism: 2
retry:
automatic:
Expand All @@ -74,8 +74,8 @@ steps:
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 120
parallelism: 2
timeout_in_minutes: 60
parallelism: 4
retry:
automatic:
- exit_status: '*'
Expand Down
6 changes: 3 additions & 3 deletions .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ steps:
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 40
timeout_in_minutes: 60
parallelism: 2
retry:
automatic:
Expand All @@ -108,8 +108,8 @@ steps:
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 120
parallelism: 2
timeout_in_minutes: 60
parallelism: 4
retry:
automatic:
- exit_status: '*'
Expand Down
42 changes: 21 additions & 21 deletions .buildkite/pipelines/pull_request/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,49 +62,49 @@ steps:
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 40
timeout_in_minutes: 60
parallelism: 2
retry:
automatic:
- exit_status: '*'
limit: 1

# status_exception: Native role management is not enabled in this Elasticsearch instance
# - command: .buildkite/scripts/steps/functional/security_serverless_defend_workflows.sh
# label: 'Serverless Security Defend Workflows Cypress Tests'
# agents:
# queue: n2-4-spot
# depends_on: build
# timeout_in_minutes: 40
# retry:
# automatic:
# - exit_status: '*'
# limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_investigations.sh
label: 'Serverless Security Investigations Cypress Tests'
- command: .buildkite/scripts/steps/functional/security_serverless_explore.sh
label: 'Serverless Explore - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 40
parallelism: 4
timeout_in_minutes: 60
parallelism: 2
retry:
automatic:
- exit_status: '*'
limit: 1

- command: .buildkite/scripts/steps/functional/security_serverless_explore.sh
label: 'Serverless Security Explore Cypress Tests'
- command: .buildkite/scripts/steps/functional/security_serverless_investigations.sh
label: 'Serverless Investigations - Security Solution Cypress Tests'
agents:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 40
parallelism: 2
timeout_in_minutes: 60
parallelism: 4
retry:
automatic:
- exit_status: '*'
limit: 1

# status_exception: Native role management is not enabled in this Elasticsearch instance
# - command: .buildkite/scripts/steps/functional/security_serverless_defend_workflows.sh
# label: 'Serverless Security Defend Workflows Cypress Tests'
# agents:
# queue: n2-4-spot
# depends_on: build
# timeout_in_minutes: 60
# retry:
# automatic:
# - exit_status: '*'
# limit: 1

- command: .buildkite/scripts/steps/lint.sh
label: 'Linting'
agents:
Expand Down

0 comments on commit 39c9888

Please sign in to comment.