Skip to content

Commit

Permalink
Merge branch 'main' into field-types-help
Browse files Browse the repository at this point in the history
  • Loading branch information
dimaanj authored Apr 1, 2022
2 parents 0dd77a4 + 6a44f1f commit ef05603
Show file tree
Hide file tree
Showing 6,095 changed files with 265,651 additions and 236,310 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion .backportrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"repoName": "kibana",
"targetBranchChoices": [
"main",
"8.2",
"8.1",
"8.0",
"7.17",
Expand Down Expand Up @@ -38,7 +39,7 @@
"backport"
],
"branchLabelMapping": {
"^v8.2.0$": "main",
"^v8.3.0$": "main",
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
},
"autoMerge": true,
Expand Down
6 changes: 6 additions & 0 deletions .buildkite/pipelines/artifacts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
steps:
- command: .buildkite/scripts/steps/artifacts/build.sh
label: Build Kibana Artifacts
agents:
queue: c2-16
timeout_in_minutes: 60
2 changes: 2 additions & 0 deletions .buildkite/pipelines/flaky_tests/runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ for (const testSuite of testSuites) {
concurrency_group: UUID,
concurrency_method: 'eager',
});
break;

case 'cypress':
const CYPRESS_SUITE = CI_GROUP;
const group = groups.find((group) => group.key.includes(CYPRESS_SUITE));
Expand Down
33 changes: 33 additions & 0 deletions .buildkite/pipelines/fleet/packages_daily.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
steps:
- command: .buildkite/scripts/lifecycle/pre_build.sh
label: Pre-Build
timeout_in_minutes: 10
agents:
queue: kibana-default

- wait

- command: .buildkite/scripts/steps/build_kibana.sh
label: Build Kibana Distribution and Plugins
agents:
queue: c2-16
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
timeout_in_minutes: 60

- wait

- command: .buildkite/scripts/steps/fleet/install_all_packages.sh
label: Install All Packages
agents:
queue: n2-2
key: linting
timeout_in_minutes: 90

- wait: ~
continue_on_failure: true

- label: Post-Build
command: .buildkite/scripts/lifecycle/post_build.sh
agents:
queue: kibana-default
180 changes: 0 additions & 180 deletions .buildkite/pipelines/hourly.yml

This file was deleted.

Loading

0 comments on commit ef05603

Please sign in to comment.