Skip to content

Commit ae242e3

Browse files
Merge branch 'main' into younesmln-kibana-config-for-max-number-of-services-per-service-group
2 parents 58bbf97 + fb584d6 commit ae242e3

File tree

1,068 files changed

+29443
-16364
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,068 files changed

+29443
-16364
lines changed

.buildkite/pipelines/flaky_tests/pipeline.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,12 @@ for (const testSuite of testSuites) {
174174
concurrency: concurrency,
175175
concurrency_group: process.env.UUID,
176176
concurrency_method: 'eager',
177+
env: {
178+
// disable split of test cases between parallel jobs when running them in flaky test runner
179+
// by setting chunks vars to value 1, which means all test will run in one job
180+
CLI_NUMBER: 1,
181+
CLI_COUNT: 1,
182+
},
177183
});
178184
break;
179185
default:

.buildkite/pipelines/on_merge.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,23 @@ steps:
1111
automatic:
1212
- exit_status: '*'
1313
limit: 1
14-
1514
- wait
1615

16+
- label: 'Triggering changes-based pipelines'
17+
branches: main
18+
agents:
19+
queue: kibana-default
20+
plugins:
21+
- chronotc/monorepo-diff#v2.0.4:
22+
watch:
23+
- path:
24+
- 'versions.json'
25+
config:
26+
command: 'node .buildkite/scripts/steps/trigger_pipeline.js kibana-buildkite-pipelines-deploy main'
27+
label: 'Trigger pipeline deploy'
28+
agents:
29+
queue: 'kibana-default'
30+
1731
- command: .buildkite/scripts/steps/on_merge_build_and_metrics.sh
1832
label: Build Kibana Distribution and Plugins
1933
agents:

.buildkite/pull_requests.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
"^\\.github/",
2929
"\\.md$",
3030
"\\.mdx$",
31+
"^api_docs/.+\\.devdocs\\.json$",
3132
"^\\.backportrc\\.json$",
3233
"^nav-kibana-dev\\.docnav\\.json$",
3334
"^src/dev/prs/kibana_qa_pr_list\\.json$",
3435
"^\\.buildkite/pull_requests\\.json$"
3536
],
3637
"always_require_ci_on_changed": [
37-
"^docs/developer/plugin-list.asciidoc$",
38-
"/plugins/[^/]+/readme\\.(md|asciidoc)$"
38+
"^docs/developer/plugin-list.asciidoc$"
3939
],
4040
"kibana_versions_check": true
4141
}

.buildkite/scripts/lifecycle/pre_command.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ EOF
8787
GITHUB_TOKEN=$(retry 5 5 vault read -field=github_token secret/kibana-issues/dev/kibanamachine)
8888
export GITHUB_TOKEN
8989

90+
KIBANA_CI_GITHUB_TOKEN=$(retry 5 5 vault read -field=github_token secret/kibana-issues/dev/kibana-ci-github)
91+
export KIBANA_CI_GITHUB_TOKEN
92+
9093
KIBANA_CI_REPORTER_KEY=$(retry 5 5 vault read -field=value secret/kibana-issues/dev/kibanamachine-reporter)
9194
export KIBANA_CI_REPORTER_KEY
9295

.buildkite/scripts/steps/build_api_docs.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,6 @@ if [[ "${PUBLISH_API_DOCS_CHANGES:-}" == "true" ]]; then
3030
prUrl=$(gh pr create --repo elastic/kibana --title "[api-docs] $(date +%F) Daily api_docs build" --body "Generated by $BUILDKITE_BUILD_URL" --label "release_note:skip" --label "backport:auto-version")
3131
echo "Opened PR: $prUrl"
3232
gh pr merge --repo elastic/kibana --auto --squash "$prUrl"
33+
34+
GH_TOKEN="$KIBANA_CI_GITHUB_TOKEN" gh pr review --repo elastic/kibana --approve -b "Automated review from $BUILDKITE_BUILD_URL" "$prUrl"
3335
fi

.buildkite/scripts/steps/es_snapshots/create_manifest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ const { BASE_BUCKET_DAILY } = require('./bucket_config');
9696
cd "${destination}"
9797
gsutil -m cp -r *.* gs://${BASE_BUCKET_DAILY}/${DESTINATION}
9898
cp manifest.json manifest-latest.json
99-
gsutil cp manifest-latest.json gs://${BASE_BUCKET_DAILY}/${VERSION}
99+
gsutil -h "Cache-Control:no-cache, max-age=0, no-transform" cp manifest-latest.json gs://${BASE_BUCKET_DAILY}/${VERSION}
100100
101101
buildkite-agent meta-data set ES_SNAPSHOT_MANIFEST 'https://storage.googleapis.com/${BASE_BUCKET_DAILY}/${DESTINATION}/manifest.json'
102102
buildkite-agent meta-data set ES_SNAPSHOT_VERSION '${VERSION}'

.buildkite/scripts/steps/es_snapshots/promote.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ node "$(dirname "${0}")/promote_manifest.js" "$ES_SNAPSHOT_MANIFEST"
1515

1616
if [[ "$BUILDKITE_BRANCH" == "main" ]]; then
1717
echo "--- Trigger agent packer cache pipeline"
18-
node .buildkite/scripts/steps/trigger_packer_cache.js
18+
node .buildkite/scripts/steps/trigger_pipeline.js kibana-agent-packer-cache main
1919
fi

.buildkite/scripts/steps/es_snapshots/promote_manifest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ const { BASE_BUCKET_DAILY, BASE_BUCKET_PERMANENT } = require('./bucket_config');
3939
`
4040
set -euo pipefail
4141
cp manifest.json manifest-latest-verified.json
42-
gsutil cp manifest-latest-verified.json gs://${BASE_BUCKET_DAILY}/${version}/
42+
gsutil -h "Cache-Control:no-cache, max-age=0, no-transform" cp manifest-latest-verified.json gs://${BASE_BUCKET_DAILY}/${version}/
4343
rm manifest.json
4444
cp manifest-permanent.json manifest.json
4545
gsutil -m cp -r gs://${bucket}/* gs://${BASE_BUCKET_PERMANENT}/${version}/
46-
gsutil cp manifest.json gs://${BASE_BUCKET_PERMANENT}/${version}/
46+
gsutil -h "Cache-Control:no-cache, max-age=0, no-transform" cp manifest.json gs://${BASE_BUCKET_PERMANENT}/${version}/
4747
`,
4848
{ shell: '/bin/bash' }
4949
);

.buildkite/scripts/steps/functional/security_solution.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ set -euo pipefail
55
source .buildkite/scripts/steps/functional/common.sh
66

77
export JOB=kibana-security-solution-chrome
8-
export CLI_NUMBER=$((BUILDKITE_PARALLEL_JOB+1))
9-
export CLI_COUNT=$BUILDKITE_PARALLEL_JOB_COUNT
8+
export CLI_NUMBER=${CLI_NUMBER:-$((BUILDKITE_PARALLEL_JOB+1))}
9+
export CLI_COUNT=${CLI_COUNT:-$BUILDKITE_PARALLEL_JOB_COUNT}
1010

1111
echo "--- Security Solution tests (Chrome)"
1212

.buildkite/scripts/steps/trigger_packer_cache.js renamed to .buildkite/scripts/steps/trigger_pipeline.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@
88

99
const { BuildkiteClient } = require('kibana-buildkite-library');
1010

11+
const pipelineSlug = process.argv[2];
12+
const branch = process.argv[3] || 'main';
13+
const commit = process.argv[4] || 'HEAD';
14+
1115
(async () => {
1216
try {
1317
const client = new BuildkiteClient();
14-
const build = await client.triggerBuild('kibana-agent-packer-cache', {
15-
commit: 'HEAD',
16-
branch: 'main',
18+
const build = await client.triggerBuild(pipelineSlug, {
19+
commit,
20+
branch,
1721
ignore_pipeline_branch_filters: true, // Required because of a Buildkite bug
1822
});
1923
console.log(`Triggered build: ${build.web_url}`);

0 commit comments

Comments
 (0)