Skip to content

Commit ad93bbd

Browse files
[9.2] [CI / Cloud] Add Kibana 8gb node smoke tests (#238372) (#239031)
# Backport This will backport the following commits from `main` to `9.2`: - [[CI / Cloud] Add Kibana 8gb node smoke tests (#238372)](#238372) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Brad White","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-10-14T23:56:30Z","message":"[CI / Cloud] Add Kibana 8gb node smoke tests (#238372)\n\n## Summary\n\nCloses #238371\n\n### Testing\n- https://buildkite.com/elastic/kibana-deploy-cloud-from-pr/builds/479\n- [PR\ndeployment](https://buildkite.com/elastic/kibana-pull-request/builds/350500#annotation-cloud)","sha":"e9a9fac3cadb95e7bc3a5d183f52d5e11290c134","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","backport:all-open","ci:cloud-deploy","ci:cloud-redeploy","v9.3.0"],"title":"[CI / Cloud] Add Kibana 8gb node smoke tests","number":238372,"url":"https://github.com/elastic/kibana/pull/238372","mergeCommit":{"message":"[CI / Cloud] Add Kibana 8gb node smoke tests (#238372)\n\n## Summary\n\nCloses #238371\n\n### Testing\n- https://buildkite.com/elastic/kibana-deploy-cloud-from-pr/builds/479\n- [PR\ndeployment](https://buildkite.com/elastic/kibana-pull-request/builds/350500#annotation-cloud)","sha":"e9a9fac3cadb95e7bc3a5d183f52d5e11290c134"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/238372","number":238372,"mergeCommit":{"message":"[CI / Cloud] Add Kibana 8gb node smoke tests (#238372)\n\n## Summary\n\nCloses #238371\n\n### Testing\n- https://buildkite.com/elastic/kibana-deploy-cloud-from-pr/builds/479\n- [PR\ndeployment](https://buildkite.com/elastic/kibana-pull-request/builds/350500#annotation-cloud)","sha":"e9a9fac3cadb95e7bc3a5d183f52d5e11290c134"}}]}] BACKPORT--> Co-authored-by: Brad White <[email protected]>
1 parent cb8c229 commit ad93bbd

File tree

4 files changed

+61
-5
lines changed

4 files changed

+61
-5
lines changed

.buildkite/pipelines/artifacts.yml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ steps:
66
imageProject: elastic-images-prod
77
provider: gcp
88
machineType: c2-standard-16
9-
diskSizeGb: 150
9+
diskSizeGb: 160
1010
timeout_in_minutes: 120
1111
retry:
1212
automatic:
@@ -122,6 +122,32 @@ steps:
122122
- exit_status: '*'
123123
limit: 1
124124

125+
- command: KIBANA_MEMORY_SIZE=8192 .buildkite/scripts/steps/artifacts/cloud.sh
126+
label: 'Cloud Deployment - 8GB Kibana Node'
127+
soft_fail:
128+
- exit_status: 255
129+
- exit_status: -1
130+
agents:
131+
image: family/kibana-ubuntu-2404
132+
imageProject: elastic-images-prod
133+
provider: gcp
134+
machineType: n2-standard-2
135+
timeout_in_minutes: 60
136+
if: "build.env('RELEASE_BUILD') == null || build.env('RELEASE_BUILD') == '' || build.env('RELEASE_BUILD') == 'false'"
137+
retry:
138+
automatic:
139+
# Timeout and graceful shutdown | ecctl deployment create falure
140+
- exit_status: 255
141+
limit: 0
142+
143+
# Timeout and forced shutdown
144+
- exit_status: '-1'
145+
limit: 0
146+
147+
# Test failures
148+
- exit_status: '*'
149+
limit: 1
150+
125151
- wait
126152

127153
- command: .buildkite/scripts/steps/artifacts/publish.sh

.buildkite/scripts/steps/artifacts/cloud.sh

100644100755
Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@ if [[ "${DRY_RUN:-}" =~ ^(true|1)$ ]]; then
1212
exit 0
1313
fi
1414

15+
KIBANA_MEMORY_SIZE=${KIBANA_MEMORY_SIZE:-2048}
16+
case "$KIBANA_MEMORY_SIZE" in
17+
1024|2048|4096|8192)
18+
echo "--- Kibana node memory size: ${KIBANA_MEMORY_SIZE}MB"
19+
;;
20+
*)
21+
echo "Error: KIBANA_MEMORY_SIZE must be one of: 1024, 2048, 4096, 8192. Got: $KIBANA_MEMORY_SIZE"
22+
exit 1
23+
;;
24+
esac
25+
1526
echo "--- Push docker image"
1627
mkdir -p target
1728

@@ -32,7 +43,13 @@ else
3243
fi
3344

3445
echo "--- Create deployment"
35-
CLOUD_DEPLOYMENT_NAME="kibana-artifacts-$TAG"
46+
BASE_DEPLOYMENT_NAME="kibana-artifacts"
47+
48+
if [[ $KIBANA_MEMORY_SIZE -ne 2048 ]]; then
49+
CLOUD_DEPLOYMENT_NAME="$BASE_DEPLOYMENT_NAME-${KIBANA_MEMORY_SIZE}mb-$TAG"
50+
else
51+
CLOUD_DEPLOYMENT_NAME="$BASE_DEPLOYMENT_NAME-$TAG"
52+
fi
3653

3754
LOGS=$(mktemp --suffix ".json")
3855
DEPLOYMENT_SPEC=$(mktemp --suffix ".json")
@@ -42,7 +59,8 @@ jq '
4259
.resources.kibana[0].plan.kibana.docker_image = "'$KIBANA_TEST_IMAGE'" |
4360
.resources.kibana[0].plan.kibana.version = "'$FULL_VERSION'" |
4461
.resources.elasticsearch[0].plan.elasticsearch.version = "'$FULL_VERSION'" |
45-
.resources.integrations_server[0].plan.integrations_server.version = "'$FULL_VERSION'"
62+
.resources.integrations_server[0].plan.integrations_server.version = "'$FULL_VERSION'" |
63+
.resources.kibana[0].plan.cluster_topology[0].size.value = '$KIBANA_MEMORY_SIZE'
4664
' .buildkite/scripts/steps/cloud/deploy.json > "$DEPLOYMENT_SPEC"
4765

4866
function shutdown {

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ export KBN_NP_PLUGINS_BUILT=true
1111
VERSION="$(jq -r '.version' package.json)-SNAPSHOT"
1212
ECCTL_LOGS=$(mktemp --suffix ".json")
1313

14+
KIBANA_MEMORY_SIZE=${KIBANA_MEMORY_SIZE:-2048}
15+
case "$KIBANA_MEMORY_SIZE" in
16+
1024|2048|4096|8192)
17+
echo "--- Kibana node memory size: ${KIBANA_MEMORY_SIZE}MB"
18+
;;
19+
*)
20+
echo "Error: KIBANA_MEMORY_SIZE must be one of: 1024, 2048, 4096, 8192. Got: $KIBANA_MEMORY_SIZE"
21+
exit 1
22+
;;
23+
esac
24+
1425
echo "--- Download Kibana Distribution"
1526

1627
mkdir -p ./target
@@ -75,7 +86,8 @@ if [ -z "${CLOUD_DEPLOYMENT_ID}" ] || [ "${CLOUD_DEPLOYMENT_ID}" = 'null' ]; the
7586
.name = "'$CLOUD_DEPLOYMENT_NAME'" |
7687
.resources.kibana[0].plan.kibana.version = "'$VERSION'" |
7788
.resources.elasticsearch[0].plan.elasticsearch.version = "'$VERSION'" |
78-
.resources.integrations_server[0].plan.integrations_server.version = "'$VERSION'"
89+
.resources.integrations_server[0].plan.integrations_server.version = "'$VERSION'" |
90+
.resources.kibana[0].plan.cluster_topology[0].size.value = '$KIBANA_MEMORY_SIZE'
7991
' .buildkite/scripts/steps/cloud/deploy.json > /tmp/deploy.json
8092

8193
echo "Creating deployment..."

.buildkite/scripts/steps/cloud/deploy.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
"instance_configuration_id": "gcp.kibana.n2.68x32x45",
172172
"zone_count": 1,
173173
"size": {
174-
"value": 2048,
174+
"value": null,
175175
"resource": "memory"
176176
}
177177
}

0 commit comments

Comments
 (0)