Skip to content

Commit

Permalink
Merge branch 'master' into task-manager/docs-monitoring
Browse files Browse the repository at this point in the history
* master: (45 commits)
  Add outcome of node scripts/build_api_docs (#93399)
  [Lens] fix long field name on field stats panel doesn't wrap (#93279)
  [Bug] Fix filter creation for numeric scripted fields in Discover (#93224)
  [uptime] Fix anomaly alert edit (#93025)
  Consolidate @babel/* packages and use latest compatible version (#93264)
  [Search Embeddable] Add highlighting when searching (#93178)
  [APM] Add missing bottom border to header (#93179)
  [CI] No longer collect APM span stack traces (#93263)
  [XY Chart] Fix "No data to display" error when using IP range aggregation to split series (#93024)
  update generated public api docs
  API DOCS Step 3/3 (#92929)
  chore(NA): look for bazel packages on npm_module folder during distributable build (#93262)
  rename advanced setting ml:fileDataVisualizerMaxFileSize to fileUpload:maxFileSize and increase max geojson upload size to 1GB (#92620)
  [kbn/optimizer] allow customizing the limits path from the script (#93153)
  [Alerting][Docs] Adding template for documenting alert and action types (#92830)
  [jenkins] convert baseline capture job to use tasks (#93288)
  removing the linked issue in comments from PR (#93303)
  chore(NA): do not include fs within a storybook build (#93294)
  [Maps] Update Map extent queries to use bounding box logic for both point and shape queries (#93156)
  Add searchDuration to EQL and Threshold rules (#93149)
  ...
  • Loading branch information
gmmorris committed Mar 3, 2021
2 parents deb8160 + dfba425 commit b0c15d5
Show file tree
Hide file tree
Showing 620 changed files with 298,617 additions and 5,836 deletions.
62 changes: 35 additions & 27 deletions .ci/Jenkinsfile_baseline_capture
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,48 @@
library 'kibana-pipeline-library'
kibanaLibrary.load()

kibanaPipeline(timeoutMinutes: 120) {
kibanaPipeline(timeoutMinutes: 210) {
githubCommitStatus.trackBuild(params.commit, 'kibana-ci-baseline') {
ciStats.trackBuild {
catchError {
withEnv([
'CI_PARALLEL_PROCESS_NUMBER=1'
]) {
parallel([
'oss-baseline': {
workers.ci(name: 'oss-baseline', size: 'l', ramDisk: true, runErrorReporter: false, bootstrapped: false) {
// bootstrap ourselves, but with the env needed to upload the ts refs cache
withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
withEnv([
'BUILD_TS_REFS_CACHE_ENABLE=true',
'BUILD_TS_REFS_CACHE_CAPTURE=true'
]) {
kibanaPipeline.doSetup()
}
}
catchErrors {
slackNotifications.onFailure(
title: "*<${env.BUILD_URL}|[${params.branch}] Baseline Capture Failure>*",
message: "[${params.branch}/${params.commit}] Baseline Capture Failure",
) {
retryable.enable(2)

kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
catchErrors {
workers.ci(
name: 'baseline-worker',
size: 'xl',
ramDisk: true,
runErrorReporter: false,
bootstrapped: false
) {
withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
withEnv([
'BUILD_TS_REFS_CACHE_ENABLE=true',
'BUILD_TS_REFS_CACHE_CAPTURE=true',
'DISABLE_BOOTSTRAP_VALIDATIONS=true',
]) {
kibanaPipeline.doSetup()
}
}
},
'xpack-baseline': {
workers.ci(name: 'xpack-baseline', size: 'l', ramDisk: true, runErrorReporter: false) {
kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh')()

kibanaPipeline.withCiTaskQueue([parallel: 2]) {
catchErrors {
tasks([
kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh'),
kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh'),
])
}
}
},
])
}
}
}
}

kibanaPipeline.sendMail()
slackNotifications.onFailure()
}

kibanaPipeline.sendMail()
}
}
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.aws-config.json
.signing-config.json
/api_docs
.ackrc
/.es
/.chromium
Expand Down
Loading

0 comments on commit b0c15d5

Please sign in to comment.