Skip to content

Commit c815b5d

Browse files
authored
[7.17] chore(NA): bootstraps twice per attempt (#228839) (#228860)
# Backport This will backport the following commits from `main` to `7.17`: - [chore(NA): bootstraps twice per attempt (#228839)](#228839) <!--- Backport version: 10.0.1 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Tiago Costa","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-07-21T19:21:47Z","message":"chore(NA): bootstraps twice per attempt (#228839)\n\nThis is a redo of #228411 applying\nit consistently across the board.\n\nThat is meant to be a temporary measure until we remove bazel and\npotentially upgrade the package manager.\n\n---------\n\nCo-authored-by: Alex Szabo <[email protected]>","sha":"bf8d97c2b37028dc2a9664a7fa5eb993ca3dd9d9","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Operations","release_note:skip","backport:version","v9.1.0","v8.19.0","v9.2.0","v8.18.4","v9.0.4","v7.17.30","v8.17.9"],"title":"chore(NA): bootstraps twice per attempt","number":228839,"url":"https://github.com/elastic/kibana/pull/228839","mergeCommit":{"message":"chore(NA): bootstraps twice per attempt (#228839)\n\nThis is a redo of #228411 applying\nit consistently across the board.\n\nThat is meant to be a temporary measure until we remove bazel and\npotentially upgrade the package manager.\n\n---------\n\nCo-authored-by: Alex Szabo <[email protected]>","sha":"bf8d97c2b37028dc2a9664a7fa5eb993ca3dd9d9"}},"sourceBranch":"main","suggestedTargetBranches":["7.17"],"targetPullRequestStates":[{"branch":"9.1","label":"v9.1.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/228856","number":228856,"state":"MERGED","mergeCommit":{"sha":"355ba289e49dac949c549ef5d260e9650b337262","message":"[9.1] chore(NA): bootstraps twice per attempt (#228839) (#228856)\n\n# Backport\n\nThis will backport the following commits from `main` to `9.1`:\n- [chore(NA): bootstraps twice per attempt\n(#228839)](https://github.com/elastic/kibana/pull/228839)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Tiago Costa <[email protected]>\nCo-authored-by: Alex Szabo <[email protected]>"}},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/228854","number":228854,"state":"MERGED","mergeCommit":{"sha":"eb0e36c01b23770560db277077426ed79b479d3d","message":"[8.19] chore(NA): bootstraps twice per attempt (#228839) (#228854)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.19`:\n- [chore(NA): bootstraps twice per attempt\n(#228839)](https://github.com/elastic/kibana/pull/228839)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Tiago Costa <[email protected]>\nCo-authored-by: Alex Szabo <[email protected]>"}},{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/228839","number":228839,"mergeCommit":{"message":"chore(NA): bootstraps twice per attempt (#228839)\n\nThis is a redo of #228411 applying\nit consistently across the board.\n\nThat is meant to be a temporary measure until we remove bazel and\npotentially upgrade the package manager.\n\n---------\n\nCo-authored-by: Alex Szabo <[email protected]>","sha":"bf8d97c2b37028dc2a9664a7fa5eb993ca3dd9d9"}},{"branch":"8.18","label":"v8.18.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/228853","number":228853,"state":"MERGED","mergeCommit":{"sha":"cf6aba209d68c66b98a30f3447420d042eb92493","message":"[8.18] chore(NA): bootstraps twice per attempt (#228839) (#228853)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.18`:\n- [chore(NA): bootstraps twice per attempt\n(#228839)](https://github.com/elastic/kibana/pull/228839)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Tiago Costa <[email protected]>\nCo-authored-by: Alex Szabo <[email protected]>"}},{"branch":"9.0","label":"v9.0.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/228855","number":228855,"state":"MERGED","mergeCommit":{"sha":"dada0e52281164637dbf839e207589378a897734","message":"[9.0] chore(NA): bootstraps twice per attempt (#228839) (#228855)\n\n# Backport\n\nThis will backport the following commits from `main` to `9.0`:\n- [chore(NA): bootstraps twice per attempt\n(#228839)](https://github.com/elastic/kibana/pull/228839)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Tiago Costa <[email protected]>\nCo-authored-by: Alex Szabo <[email protected]>"}},{"branch":"7.17","label":"v7.17.30","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.17","label":"v8.17.9","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/228852","number":228852,"state":"MERGED","mergeCommit":{"sha":"9806c5702a55e532aed56208cc881f1c4f42ce79","message":"[8.17] chore(NA): bootstraps twice per attempt (#228839) (#228852)\n\n# Backport\n\nThis will backport the following commits from `main` to `8.17`:\n- [chore(NA): bootstraps twice per attempt\n(#228839)](https://github.com/elastic/kibana/pull/228839)\n\n\n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sorenlouv/backport)\n\n\n\nCo-authored-by: Tiago Costa <[email protected]>\nCo-authored-by: Alex Szabo <[email protected]>"}}]}] BACKPORT-->
1 parent 216aac3 commit c815b5d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.buildkite/scripts/bootstrap.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ source .buildkite/scripts/common/util.sh
66
source .buildkite/scripts/common/setup_bazel.sh
77

88
echo "--- yarn install and bootstrap"
9-
if ! yarn kbn bootstrap; then
9+
if ! (yarn kbn bootstrap || yarn kbn bootstrap); then
1010
echo "bootstrap failed, trying again in 15 seconds"
1111
sleep 15
1212

@@ -15,7 +15,7 @@ if ! yarn kbn bootstrap; then
1515
rm -rf node_modules
1616

1717
echo "--- yarn install and bootstrap, attempt 2"
18-
yarn kbn bootstrap --force-install
18+
yarn kbn bootstrap --force-install || yarn kbn bootstrap
1919
fi
2020

2121
if [[ "$DISABLE_BOOTSTRAP_VALIDATION" != "true" ]]; then
@@ -31,4 +31,4 @@ if [[ "${BUILD_TS_REFS_CACHE_CAPTURE:-}" == "true" ]]; then
3131
"$KIBANA_DIR/.buildkite/scripts/common/activate_service_account.sh" gs://kibana-ci-ts-refs-cache
3232
gsutil cp "*.zip" 'gs://kibana-ci-ts-refs-cache/'
3333
cd "$KIBANA_DIR"
34-
fi
34+
fi

0 commit comments

Comments
 (0)