Skip to content

Commit 8f73399

Browse files
elasticmachineelasticmachine
authored
Merge branch '8.x' into eui/v101.1.0-8.x
2 parents 132bc6d + d0cf51e commit 8f73399

351 files changed

Lines changed: 8850 additions & 3953 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/pipelines/pull_request/build_cloud_fips_image.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
steps:
2+
- command: .buildkite/scripts/steps/fips/build_cloud_fips_image.sh
3+
label: 'Build Cloud FIPS Image'
4+
agents:
5+
machineType: n2-standard-2
6+
preemptible: true
7+
depends_on:
8+
- build
9+
- quick_checks
10+
- checks
11+
- linting
12+
- linting_with_types
13+
- check_types
14+
- check_oas_snapshot
15+
timeout_in_minutes: 60
16+
soft_fail: true
17+
retry:
18+
automatic:
19+
- exit_status: '-1'
20+
limit: 3

‎.buildkite/pipelines/pull_request/build_cloud_image.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
steps:
2+
- command: .buildkite/scripts/steps/cloud/build_cloud_image.sh
3+
label: 'Build Cloud Image'
4+
agents:
5+
machineType: n2-standard-2
6+
preemptible: true
7+
depends_on:
8+
- build
9+
- quick_checks
10+
- checks
11+
- linting
12+
- linting_with_types
13+
- check_types
14+
- check_oas_snapshot
15+
timeout_in_minutes: 60
16+
soft_fail: true
17+
retry:
18+
automatic:
19+
- exit_status: '-1'
20+
limit: 3

‎.buildkite/scripts/build_kibana.sh‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,6 @@ is_pr_with_label "ci:build-cdn-assets" || BUILD_ARGS+=("--skip-cdn-assets")
1919
echo "> node scripts/build" "${BUILD_ARGS[@]}"
2020
node scripts/build "${BUILD_ARGS[@]}"
2121

22-
if is_pr_with_label "ci:build-cloud-image"; then
23-
node scripts/build \
24-
--skip-initialize \
25-
--skip-generic-folders \
26-
--skip-platform-folders \
27-
--skip-cdn-assets \
28-
--skip-archives \
29-
--docker-images \
30-
--docker-tag-qualifier="$GIT_COMMIT" \
31-
--docker-push \
32-
--skip-docker-ubi \
33-
--skip-docker-fips \
34-
--skip-docker-ubuntu \
35-
--skip-docker-wolfi \
36-
--skip-docker-serverless \
37-
--skip-docker-contexts
38-
39-
CLOUD_IMAGE=$(docker images --format "{{.Repository}}:{{.Tag}}" docker.elastic.co/kibana-ci/kibana-cloud)
40-
cat << EOF | buildkite-agent annotate --style "info" --context kibana-cloud-image
41-
42-
Kibana cloud image: \`$CLOUD_IMAGE\`
43-
EOF
44-
fi
45-
4622
echo "--- Archive Kibana Distribution"
4723
version="$(jq -r '.version' package.json)"
4824
linuxBuild="$KIBANA_DIR/target/kibana-$version-SNAPSHOT-linux-x86_64.tar.gz"

‎.buildkite/scripts/pipelines/pull_request/pipeline.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,24 @@ const getPipeline = (filename: string, removeSteps = true) => {
179179
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/ai_infra_gen_ai.yml'));
180180
}
181181

182+
if (
183+
GITHUB_PR_LABELS.includes('ci:build-cloud-image') &&
184+
!GITHUB_PR_LABELS.includes('ci:deploy-cloud') &&
185+
!GITHUB_PR_LABELS.includes('ci:cloud-deploy') &&
186+
!GITHUB_PR_LABELS.includes('ci:cloud-redeploy')
187+
) {
188+
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/build_cloud_image.yml'));
189+
}
190+
191+
if (
192+
GITHUB_PR_LABELS.includes('ci:build-cloud-fips-image') &&
193+
!GITHUB_PR_LABELS.includes('ci:deploy-cloud') &&
194+
!GITHUB_PR_LABELS.includes('ci:cloud-deploy') &&
195+
!GITHUB_PR_LABELS.includes('ci:cloud-redeploy')
196+
) {
197+
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/build_cloud_fips_image.yml'));
198+
}
199+
182200
if (
183201
GITHUB_PR_LABELS.includes('ci:deploy-cloud') ||
184202
GITHUB_PR_LABELS.includes('ci:cloud-deploy') ||

‎.buildkite/scripts/pipelines/security_solution_quality_gate/create_periodic_test_docker_image.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ node scripts/build \
3838
--skip-docker-wolfi \
3939
--skip-docker-ubi \
4040
--skip-docker-cloud \
41+
--skip-docker-cloud-fips \
42+
--skip-docker-fips \
4143
--skip-docker-contexts \
4244
--skip-cdn-assets
4345

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -euo pipefail
77
source .buildkite/scripts/steps/artifacts/env.sh
88

99
echo "--- Build Kibana artifacts"
10-
node scripts/build --all-platforms --debug --docker-cross-compile --skip-docker-fips --skip-docker-serverless --skip-cdn-assets "${BUILD_ARGS[@]}"
10+
node scripts/build --all-platforms --debug --docker-cross-compile --skip-docker-fips --skip-docker-cloud-fips --skip-docker-serverless --skip-cdn-assets "${BUILD_ARGS[@]}"
1111

1212
echo "--- Extract default i18n messages"
1313
mkdir -p target/i18n

‎.buildkite/scripts/steps/cloud/build_and_deploy.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ else
4343
--skip-docker-ubi \
4444
--skip-docker-fips \
4545
--skip-docker-ubuntu \
46+
--skip-docker-cloud-fips \
4647
--skip-docker-wolfi \
4748
--skip-docker-serverless \
4849
--skip-docker-contexts

‎.buildkite/scripts/steps/cloud/build_cloud_image.sh‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
source .buildkite/scripts/common/util.sh
6+
7+
.buildkite/scripts/bootstrap.sh
8+
9+
export KBN_NP_PLUGINS_BUILT=true
10+
11+
VERSION="$(jq -r '.version' package.json)-SNAPSHOT"
12+
13+
echo "--- Download Kibana Distribution"
14+
15+
mkdir -p ./target
16+
download_artifact "kibana-$VERSION-linux-x86_64.tar.gz" ./target --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
17+
18+
echo "--- Build Cloud Distribution"
19+
20+
node scripts/build \
21+
--skip-initialize \
22+
--skip-generic-folders \
23+
--skip-platform-folders \
24+
--skip-cdn-assets \
25+
--skip-archives \
26+
--docker-images \
27+
--docker-tag-qualifier="$GIT_COMMIT" \
28+
--docker-push \
29+
--skip-docker-ubi \
30+
--skip-docker-ubuntu \
31+
--skip-docker-cloud-fips \
32+
--skip-docker-fips \
33+
--skip-docker-wolfi \
34+
--skip-docker-serverless \
35+
--skip-docker-contexts
36+
37+
CLOUD_IMAGE=$(docker images --format "{{.Repository}}:{{.Tag}}" docker.elastic.co/kibana-ci/kibana-cloud)
38+
cat <<EOF | buildkite-agent annotate --style "info" --context kibana-cloud-image
39+
40+
Kibana cloud image: \`$CLOUD_IMAGE\`
41+
EOF

‎.buildkite/scripts/steps/demo_env/kibana.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ source "$(dirname "${0}")/config.sh"
1111
export KIBANA_IMAGE="gcr.io/elastic-kibana-184716/demo/kibana:$DEPLOYMENT_NAME-$(git rev-parse HEAD)"
1212

1313
echo '--- Build Kibana'
14-
node scripts/build --debug --docker-images --example-plugins --skip-docker-ubi --skip-docker-fips --skip-docker-cloud --skip-docker-serverless --skip-docker-contexts
14+
node scripts/build --debug --docker-images --example-plugins --skip-docker-ubi --skip-docker-fips --skip-docker-cloud-fips --skip-docker-cloud --skip-docker-serverless --skip-docker-contexts
1515

1616
echo '--- Build Docker image with example plugins'
1717
cd target/example_plugins

‎.buildkite/scripts/steps/fips/build.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ node scripts/build \
2525
--skip-docker-ubuntu \
2626
--skip-docker-wolfi \
2727
--skip-docker-cloud \
28+
--skip-docker-cloud-fips \
2829
--skip-docker-serverless \
2930
--skip-docker-contexts
3031

3132
# Moving to `target/` first will keep `buildkite-agent` from including directories in the artifact name
3233
cd "$KIBANA_DIR/target"
3334
buildkite-agent artifact upload "./*docker-image*.tar.gz"
3435

35-
KIBANA_UBI_FIPS_IMAGE="docker.elastic.co/kibana-ci/kibana-ubi-fips:$FULL_VERSION-$BUILDKITE_COMMIT"
36+
KIBANA_FIPS_IMAGE="docker.elastic.co/kibana-ci/kibana-fips:$FULL_VERSION-$BUILDKITE_COMMIT"
3637

37-
cat <<EOF | buildkite-agent annotate --style "info" --context fips
38-
### Kibana FIPS Image
38+
cat <<EOF | buildkite-agent annotate --style "info" --context kibana-fips-image
3939
40-
UBI image: \`$KIBANA_UBI_FIPS_IMAGE\`
40+
Kibana FIPS image: \`$KIBANA_FIPS_IMAGE\`
4141
EOF
4242

43-
buildkite-agent meta-data set pr_comment:build_fips:head "* Kibana UBI FIPS Image: \`$KIBANA_UBI_FIPS_IMAGE\`"
43+
buildkite-agent meta-data set pr_comment:build_fips:head "* Kibana FIPS Image: \`$KIBANA_FIPS_IMAGE\`"
4444
buildkite-agent meta-data set pr_comment:early_comment_job_id "$BUILDKITE_JOB_ID"

0 commit comments

Comments
 (0)