Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into ml-dv-field-type-he…
Browse files Browse the repository at this point in the history
…lp-pop-over
  • Loading branch information
qn895 committed Jul 26, 2022
2 parents 024eac1 + 0523cd2 commit dc62950
Show file tree
Hide file tree
Showing 1,600 changed files with 51,477 additions and 26,560 deletions.
1 change: 1 addition & 0 deletions .buildkite/ftr_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ disabled:
- x-pack/test/security_solution_cypress/response_ops_cli_config.ts
- x-pack/test/security_solution_cypress/upgrade_config.ts
- x-pack/test/security_solution_cypress/visual_config.ts
- x-pack/test/threat_intelligence_cypress/visual_config.ts
- x-pack/test/functional_enterprise_search/with_host_configured.config.ts
- x-pack/plugins/apm/ftr_e2e/ftr_config_open.ts
- x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts
Expand Down
8 changes: 5 additions & 3 deletions .buildkite/pipeline-utils/ci-stats/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,13 @@ export class CiStatsClient {
});
};

getPrReport = async (buildId: string) => {
getPrReport = async (buildId: string, backfillJobIds: string[] = []) => {
const resp = await this.request<CiStatsPrReport>({
path: `v2/pr_report`,
params: {
path: `v3/pr_report`,
method: 'post',
body: {
buildId,
backfillJobIds,
},
});

Expand Down
7 changes: 4 additions & 3 deletions .buildkite/scripts/pipelines/pull_request/pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,10 @@ const uploadPipeline = (pipelineContent: string | object) => {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/observability_plugin.yml'));
}

if (await doAnyChangesMatch([/^x-pack\/plugins\/synthetics/])) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/synthetics_plugin.yml'));
}
// Skipped due to https://github.com/elastic/kibana/issues/137185
// if (await doAnyChangesMatch([/^x-pack\/plugins\/synthetics/])) {
// pipeline.push(getPipeline('.buildkite/pipelines/pull_request/synthetics_plugin.yml'));
// }

if (await doAnyChangesMatch([/^x-pack\/plugins\/ux/])) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/ux_plugin_e2e.yml'));
Expand Down
4 changes: 0 additions & 4 deletions .buildkite/scripts/steps/es_snapshots/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ mkdir -p "$destination"
mkdir -p elasticsearch && cd elasticsearch

export ELASTICSEARCH_BRANCH="${ELASTICSEARCH_BRANCH:-$BUILDKITE_BRANCH}"
# Until ES renames their master branch to main...
if [[ "$ELASTICSEARCH_BRANCH" == "main" ]]; then
export ELASTICSEARCH_BRANCH="master"
fi

if [[ ! -d .git ]]; then
git init
Expand Down
6 changes: 6 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,12 @@ x-pack/plugins/session_view @elastic/awp-platform
x-pack/plugins/security_solution/public/common/components/sessions_viewer @elastic/awp-platform
x-pack/plugins/security_solution/public/kubernetes @elastic/awp-platform

## Security Solution sub teams - Protections Experience
x-pack/plugins/threat_intelligence @elastic/protections-experience
x-pack/plugins/security_solution/public/threat_intelligence @elastic/protections-experience
x-pack/test/threat_intelligence_cypress @elastic/protections-experience


# Security Intelligence And Analytics
/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics

Expand Down
Loading

0 comments on commit dc62950

Please sign in to comment.