Skip to content

Commit de171db

Browse files
stratoulastratoula
committed
Merge with main and resolve conflicts
2 parents a4ae461 + dce0ba1 commit de171db

1,203 files changed

Lines changed: 85679 additions & 84749 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/pipeline-resource-definitions/kibana-pointer-compression.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
2+
apiVersion: backstage.io/v1alpha1
3+
kind: Resource
4+
metadata:
5+
name: bk-kibana-pointer-compression
6+
description: Run all Kibana tests using Node.js with pointer compression enabled
7+
links:
8+
- title: Pipeline link
9+
url: https://buildkite.com/elastic/kibana-pointer-compression
10+
spec:
11+
type: buildkite-pipeline
12+
owner: group:kibana-operations
13+
system: buildkite
14+
implementation:
15+
apiVersion: buildkite.elastic.dev/v1
16+
kind: Pipeline
17+
metadata:
18+
name: kibana / pointer compression
19+
description: Run all Kibana tests using Node.js with pointer compression enabled
20+
spec:
21+
env:
22+
SLACK_NOTIFICATIONS_CHANNEL: "#kibana-operations-alerts"
23+
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
24+
repository: elastic/kibana
25+
branch_configuration: main
26+
default_branch: main
27+
pipeline_file: ".buildkite/pipelines/pointer_compression.yml"
28+
provider_settings:
29+
trigger_mode: none
30+
teams:
31+
kibana-operations:
32+
access_level: MANAGE_BUILD_AND_READ
33+
everyone:
34+
access_level: READ_ONLY

‎.buildkite/pipeline-resource-definitions/locations.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,4 @@ spec:
4343
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/security-solution-quality-gate/kibana-serverless-security-solution-quality-gate-investigations.yml
4444
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/security-solution-quality-gate/kibana-serverless-security-solution-quality-gate-rule-management.yml
4545
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/trigger-version-dependent-jobs.yml
46+
- https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-pointer-compression.yml

‎.buildkite/pipelines/pointer_compression.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
steps:
2+
- label: "Placeholder"
3+
command: echo 'placeholder while pipeline is implemented'

‎.buildkite/scripts/build_kibana.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ EOF
4444
fi
4545

4646
echo "--- Archive Kibana Distribution"
47-
linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
47+
version="$(jq -r '.version' package.json)"
48+
linuxBuild="$KIBANA_DIR/target/kibana-$version-SNAPSHOT-linux-x86_64.tar.gz"
4849
installDir="$KIBANA_DIR/install/kibana"
4950
mkdir -p "$installDir"
5051
tar -xzf "$linuxBuild" -C "$installDir" --strip=1

‎.buildkite/scripts/post_build_kibana.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ fi
1919

2020
echo "--- Upload Build Artifacts"
2121
# Moving to `target/` first will keep `buildkite-agent` from including directories in the artifact name
22+
version="$(jq -r '.version' package.json)"
2223
cd "$KIBANA_DIR/target"
23-
cp kibana-*-linux-x86_64.tar.gz kibana-default.tar.gz
24+
cp "kibana-$version-SNAPSHOT-linux-x86_64.tar.gz" kibana-default.tar.gz
2425
buildkite-agent artifact upload "./*.tar.gz;./*.zip;./*.deb;./*.rpm"
2526
cd -

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]] || [[ "${DRY_RUN:-}" =~ ^(
6262
download_artifact beats_manifest.json /tmp --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
6363
export BEATS_MANIFEST_URL=$(jq -r .manifest_url /tmp/beats_manifest.json)
6464

65-
if [[ "$DRY_RUN" =~ ^(1|true)$ ]]; then
65+
if [[ "${DRY_RUN:-}" =~ ^(1|true)$ ]]; then
6666
docker run --rm \
6767
--name release-manager \
6868
-e VAULT_ADDR \

‎.buildkite/scripts/steps/checks.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ fi
1313
.buildkite/scripts/steps/capture_oas_snapshot.sh
1414
.buildkite/scripts/steps/code_generation/elastic_assistant_codegen.sh
1515
.buildkite/scripts/steps/code_generation/security_solution_codegen.sh
16+
.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
1617
.buildkite/scripts/steps/code_generation/osquery_codegen.sh

‎.buildkite/scripts/steps/checks/i18n.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ set -euo pipefail
55
source .buildkite/scripts/common/util.sh
66

77
echo --- Check i18n
8-
node scripts/i18n_check --ignore-missing
8+
node scripts/i18n_check

‎.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh‎

100644100755
File mode changed.

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1293,7 +1293,7 @@ x-pack/test_serverless/api_integration/test_suites/common/security_response_head
12931293
x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kibana-core @elastic/kibana-telemetry @shahinakmal
12941294

12951295
# Kibana Localization
1296-
/src/dev/i18n/ @elastic/kibana-localization @elastic/kibana-core
1296+
/src/dev/i18n_tools/ @elastic/kibana-localization @elastic/kibana-core
12971297
/src/core/public/i18n/ @elastic/kibana-localization @elastic/kibana-core
12981298
#CC# /x-pack/plugins/translations/ @elastic/kibana-localization @elastic/kibana-core
12991299

0 commit comments

Comments
 (0)