Skip to content

Commit 9c489fc

Browse files
angoraycangorayc
authored
Merge branch 'main' into issue/15316
2 parents 4e03e21 + 4bdd6aa commit 9c489fc

1,177 files changed

Lines changed: 253198 additions & 10219 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ enabled:
205205
- x-pack/platform/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/with_email_aws_ses_kbn_config/config.ts
206206
- x-pack/platform/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/with_email_services_enabled_kbn_config/config.ts
207207
- x-pack/platform/test/functional_with_es_ssl/apps/triggers_actions_ui/shared/config.ts
208+
- x-pack/platform/test/functional_with_es_ssl/apps/rules/config.ts
208209
- x-pack/platform/test/functional_with_es_ssl/apps/triggers_actions_ui/connectors/webhook_disabled_ssl_pfx/config.ts
209210
- x-pack/platform/test/functional/apps/advanced_settings/config.ts
210211
- x-pack/platform/test/functional/apps/aiops/config.ts
@@ -362,6 +363,7 @@ enabled:
362363
- x-pack/performance/journeys_e2e/web_logs_dashboard_esql_long_running.ts
363364
- x-pack/performance/journeys_e2e/web_logs_dashboard_long_running.ts
364365
- x-pack/performance/journeys_e2e/data_stress_test_lens.ts
366+
- x-pack/performance/journeys_e2e/data_stress_test_lens_esql.ts
365367
- x-pack/performance/journeys_e2e/ecommerce_dashboard_saved_search_only.ts
366368
- x-pack/performance/journeys_e2e/ecommerce_dashboard_tsvb_gauge_only.ts
367369
- x-pack/performance/journeys_e2e/dashboard_listing_page.ts

‎.buildkite/package-lock.json‎

Lines changed: 24 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.buildkite/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"@octokit/rest": "^22.0.1",
1212
"adm-zip": "^0.5.16",
1313
"axios": "^1.13.4",
14+
"diff": "^4.0.4",
1415
"globby": "^11.1.0",
1516
"js-yaml": "^4.1.1",
1617
"minimatch": "^5.0.1",
@@ -33,6 +34,9 @@
3334
"typescript": "^5.1.6",
3435
"yarn": "^1.22.22"
3536
},
37+
"overrides": {
38+
"lodash": "^4.17.23"
39+
},
3640
"imports": {
3741
"#pipeline-utils": "./pipeline-utils/index.ts",
3842
"#pipeline-utils/*": "./pipeline-utils/*"

‎.buildkite/scripts/steps/artifacts/docker_image.sh‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,19 @@ else
1414
KIBANA_IMAGE_TAG="pr-$BUILDKITE_PULL_REQUEST-$GIT_ABBREV_COMMIT"
1515
fi
1616

17+
# CDN readiness file - uploaded at the very end of successful CDN asset validation
18+
CDN_READINESS_FILE="$GIT_ABBREV_COMMIT/.ready"
19+
CDN_READINESS_URL="$GCS_SA_CDN_URL/$CDN_READINESS_FILE"
20+
21+
check_cdn_assets_ready() {
22+
local url="$1"
23+
if curl --output /dev/null --silent --head --fail "$url"; then
24+
return 0
25+
else
26+
return 1
27+
fi
28+
}
29+
1730
KIBANA_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless"
1831
export KIBANA_IMAGE="$KIBANA_BASE_IMAGE:$KIBANA_IMAGE_TAG"
1932

@@ -51,17 +64,33 @@ create_and_push_manifest() {
5164
docker manifest push "$image"
5265
}
5366

54-
echo "--- Verify manifest does not already exist"
67+
echo "--- Verify manifest and CDN assets do not already exist"
5568
echo "Checking manifest for $KIBANA_IMAGE"
69+
MANIFEST_EXISTS=false
70+
CDN_ASSETS_READY=false
5671
SKIP_BUILD=false
72+
5773
if docker manifest inspect "$KIBANA_IMAGE" &> /dev/null; then
74+
MANIFEST_EXISTS=true
75+
echo "Manifest exists: $KIBANA_IMAGE"
76+
fi
77+
78+
echo "Checking CDN readiness at $CDN_READINESS_URL"
79+
if check_cdn_assets_ready "$CDN_READINESS_URL"; then
80+
CDN_ASSETS_READY=true
81+
echo "CDN assets ready: $CDN_READINESS_URL"
82+
fi
83+
84+
if [[ "$MANIFEST_EXISTS" == "true" ]]; then
5885
# If a staging build manifest already exists, there's a workflow error and the root cause should be investigated.
5986
if [[ "${BUILDKITE_PULL_REQUEST:-false}" == "false" ]]; then
6087
echo "Manifest already exists, exiting"
6188
exit 1
62-
else
63-
echo "Manifest already exists, skipping build. Look up previous build for artifacts."
89+
elif [[ "$CDN_ASSETS_READY" == "true" ]]; then
90+
echo "Manifest and CDN assets already exist, skipping build. Look up previous build for artifacts."
6491
SKIP_BUILD=true
92+
else
93+
echo "Manifest exists but CDN assets are not ready (readiness file missing), rebuilding..."
6594
fi
6695
fi
6796

@@ -130,12 +159,19 @@ if [[ "$SKIP_BUILD" == "false" ]]; then
130159
tar -xf "kibana-$BASE_VERSION-cdn-assets.tar.gz" -C "$CDN_ASSETS_FOLDER" --strip=1
131160

132161
gsutil -m cp -r "$CDN_ASSETS_FOLDER/*" "gs://$GCS_SA_CDN_BUCKET/$GIT_ABBREV_COMMIT"
133-
gcloud auth revoke "$GCS_SA_CDN_EMAIL"
134162

135163
echo "--- Validate CDN assets"
136164
ts-node "$(git rev-parse --show-toplevel)/.buildkite/scripts/steps/artifacts/validate_cdn_assets.ts" \
137165
"$GCS_SA_CDN_URL" \
138166
"$CDN_ASSETS_FOLDER"
167+
168+
echo "--- Upload CDN readiness file"
169+
# Upload readiness file to mark CDN assets as complete
170+
# This file is checked at the start to determine if a rebuild is needed
171+
echo "ready" | gsutil cp - "gs://$GCS_SA_CDN_BUCKET/$CDN_READINESS_FILE"
172+
echo "Readiness file uploaded to gs://$GCS_SA_CDN_BUCKET/$CDN_READINESS_FILE"
173+
174+
gcloud auth revoke "$GCS_SA_CDN_EMAIL"
139175
fi
140176

141177
cat << EOF | buildkite-agent annotate --style "info" --context image

‎.buildkite/scripts/steps/openapi_publishing/publish_oas_docs.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if [[ "$BUILDKITE_BRANCH" == "main" ]]; then
4949
exit 0;
5050
fi
5151

52-
if [[ "$BUILDKITE_BRANCH" == "9.2" ]]; then
52+
if [[ "$BUILDKITE_BRANCH" == "9.3" ]]; then
5353
BUMP_KIBANA_DOC_NAME="$(vault_get kibana-bump-sh kibana-doc-name)"
5454
BUMP_KIBANA_DOC_TOKEN="$(vault_get kibana-bump-sh kibana-token)"
5555
deploy_to_bump "$(pwd)/oas_docs/output/kibana.yaml" $BUMP_KIBANA_DOC_NAME $BUMP_KIBANA_DOC_TOKEN v9;

‎.claude/CLAUDE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../AGENTS.md

0 commit comments

Comments
 (0)