Skip to content

Commit 3c4ca04

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into eui/85.1.0
2 parents 06a0d50 + 757c881 commit 3c4ca04

File tree

1,092 files changed

+25161
-8902
lines changed

Some content is hidden

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

1,092 files changed

+25161
-8902
lines changed

‎.buildkite/ftr_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,5 +413,6 @@ enabled:
413413
- x-pack/performance/journeys/ecommerce_dashboard_tsvb_gauge_only.ts
414414
- x-pack/performance/journeys/dashboard_listing_page.ts
415415
- x-pack/performance/journeys/cloud_security_dashboard.ts
416+
- x-pack/performance/journeys/apm_service_inventory.ts
416417
- x-pack/test/custom_branding/config.ts
417418
- x-pack/test/profiling_api_integration/cloud/config.ts

‎.buildkite/pipelines/pull_request/defend_workflows.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ steps:
88
parallelism: 2
99
retry:
1010
automatic:
11-
- exit_status: '-1'
12-
limit: 3
1311
- exit_status: '*'
1412
limit: 1
1513
artifact_paths:
@@ -24,8 +22,6 @@ steps:
2422
parallelism: 6
2523
retry:
2624
automatic:
27-
- exit_status: '-1'
28-
limit: 3
2925
- exit_status: '*'
3026
limit: 1
3127
artifact_paths:

‎.buildkite/pipelines/pull_request/osquery_cypress.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ steps:
88
parallelism: 6
99
retry:
1010
automatic:
11-
- exit_status: '-1'
12-
limit: 3
1311
- exit_status: '*'
1412
limit: 1
1513
artifact_paths:

‎.buildkite/pipelines/pull_request/response_ops.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
parallelism: 4
99
retry:
1010
automatic:
11-
- exit_status: '-1'
12-
limit: 3
1311
- exit_status: '*'
1412
limit: 1
13+
artifact_paths:
14+
- "target/kibana-security-solution/**/*"

‎.buildkite/pipelines/pull_request/response_ops_cases.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
timeout_in_minutes: 120
88
retry:
99
automatic:
10-
- exit_status: '-1'
11-
limit: 3
1210
- exit_status: '*'
1311
limit: 1
12+
artifact_paths:
13+
- "target/kibana-security-solution/**/*"

‎.buildkite/pipelines/pull_request/security_solution.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
steps:
22
- command: .buildkite/scripts/steps/functional/security_solution.sh
3-
label: 'Security Solution Tests'
3+
label: 'Security Solution Cypress Tests'
44
agents:
55
queue: n2-4-spot
66
depends_on: build
77
timeout_in_minutes: 60
8-
parallelism: 7
8+
parallelism: 10
99
retry:
1010
automatic:
11-
- exit_status: '-1'
12-
limit: 3
1311
- exit_status: '*'
1412
limit: 1
13+
artifact_paths:
14+
- "target/kibana-security-solution/**/*"

‎.buildkite/pipelines/pull_request/security_solution_explore.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
steps:
22
- command: .buildkite/scripts/steps/functional/security_solution_explore.sh
3-
label: 'Explore - Security Solution Tests'
3+
label: 'Explore - Security Solution Cypress Tests'
44
agents:
55
queue: n2-4-spot
66
depends_on: build
77
timeout_in_minutes: 60
88
parallelism: 2
99
retry:
1010
automatic:
11-
- exit_status: '-1'
12-
limit: 3
1311
- exit_status: '*'
1412
limit: 1
13+
artifact_paths:
14+
- "target/kibana-security-solution/**/*"

‎.buildkite/pipelines/pull_request/security_solution_investigations.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
steps:
22
- command: .buildkite/scripts/steps/functional/security_solution_investigations.sh
3-
label: 'Investigations - Security Solution Tests'
3+
label: 'Investigations - Security Solution Cypress Tests'
44
agents:
55
queue: n2-4-spot
66
depends_on: build
77
timeout_in_minutes: 120
88
parallelism: 4
99
retry:
1010
automatic:
11-
- exit_status: '-1'
12-
limit: 3
1311
- exit_status: '*'
1412
limit: 1
13+
artifact_paths:
14+
- "target/kibana-security-solution/**/*"

‎.buildkite/pipelines/pull_request/threat_intelligence.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
steps:
22
- command: .buildkite/scripts/steps/functional/threat_intelligence.sh
3-
label: 'Threat Intelligence Tests'
3+
label: 'Threat Intelligence Cypress Tests'
44
agents:
55
queue: n2-4-spot
66
depends_on: build
77
timeout_in_minutes: 120
88
parallelism: 2
99
retry:
1010
automatic:
11-
- exit_status: '-1'
12-
limit: 3
1311
- exit_status: '*'
1412
limit: 1
1513
artifact_paths:

‎.buildkite/scripts/steps/artifacts/cloud.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ export CLOUD_DEPLOYMENT_ELASTICSEARCH_URL=$(ecctl deployment show "$CLOUD_DEPLOY
6969
echo "Kibana: $CLOUD_DEPLOYMENT_KIBANA_URL"
7070
echo "ES: $CLOUD_DEPLOYMENT_ELASTICSEARCH_URL"
7171

72+
# Disable ansi color output for Node.js as we want to get plain values when executing node as a script runner below
73+
export FORCE_COLOR=0
74+
7275
export TEST_KIBANA_PROTOCOL=$(node -e "console.log(new URL(process.env.CLOUD_DEPLOYMENT_KIBANA_URL).protocol.replace(':', ''))")
7376
export TEST_KIBANA_HOSTNAME=$(node -e "console.log(new URL(process.env.CLOUD_DEPLOYMENT_KIBANA_URL).hostname)")
7477
export TEST_KIBANA_PORT=$(node -e "console.log(new URL(process.env.CLOUD_DEPLOYMENT_KIBANA_URL).port || 443)")
@@ -81,6 +84,9 @@ export TEST_ES_PORT=$(node -e "console.log(new URL(process.env.CLOUD_DEPLOYMENT_
8184
export TEST_ES_USERNAME="$CLOUD_DEPLOYMENT_USERNAME"
8285
export TEST_ES_PASSWORD="$CLOUD_DEPLOYMENT_PASSWORD"
8386

87+
# Enabling ansi color output for Node.js again as we don't need to use it as a script interpreter anymore
88+
export FORCE_COLOR=1
89+
8490
export TEST_BROWSER_HEADLESS=1
8591

8692
# Error: attempted to use the "es" service to fetch Elasticsearch version info but the request failed: ConnectionError: self signed certificate in certificate chain

0 commit comments

Comments
 (0)