github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.16] [ci] Fix cloud deployments (#198086) (#204838)

Browse source 
# Backport

This will backport the following commits from `main` to `8.16`:
- [[ci] Fix cloud deployments
(#198086)](https://github.com/elastic/kibana/pull/198086)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"Jon","email":"jon@elastic.co"},"sourceCommit":{"committedDate":"2024-10-29T21:57:02Z","message":"[ci]
Fix cloud deployments (#198086)\n\nOur build scripts are relying on a
step that was removed
in\r\nhttps://github.com/elastic/elasticsearch/pull/115357. The image
that was\r\nproduced by this script is eventually consumed by cloud
deployments from\r\npull requests.\r\n\r\nThis updates our scripts to
use the cloud-ess variant instead. There\r\nshould not be any functional
difference.\r\n\r\n\r\nWe'll need the image to go through our promotion
pipeline to be tested\r\nvia
label.\r\n\r\nhttps://buildkite.com/elastic/kibana-elasticsearch-snapshot-build/builds/4673","sha":"17e72dd7ae43028ea481bbff417b85e8efebad39","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","v9.0.0","backport:prev-minor","backport:prev-major","v8.17.0"],"title":"[ci]
Fix cloud
deployments","number":198086,"url":"https://github.com/elastic/kibana/pull/198086","mergeCommit":{"message":"[ci]
Fix cloud deployments (#198086)\n\nOur build scripts are relying on a
step that was removed
in\r\nhttps://github.com/elastic/elasticsearch/pull/115357. The image
that was\r\nproduced by this script is eventually consumed by cloud
deployments from\r\npull requests.\r\n\r\nThis updates our scripts to
use the cloud-ess variant instead. There\r\nshould not be any functional
difference.\r\n\r\n\r\nWe'll need the image to go through our promotion
pipeline to be tested\r\nvia
label.\r\n\r\nhttps://buildkite.com/elastic/kibana-elasticsearch-snapshot-build/builds/4673","sha":"17e72dd7ae43028ea481bbff417b85e8efebad39"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/198086","number":198086,"mergeCommit":{"message":"[ci]
Fix cloud deployments (#198086)\n\nOur build scripts are relying on a
step that was removed
in\r\nhttps://github.com/elastic/elasticsearch/pull/115357. The image
that was\r\nproduced by this script is eventually consumed by cloud
deployments from\r\npull requests.\r\n\r\nThis updates our scripts to
use the cloud-ess variant instead. There\r\nshould not be any functional
difference.\r\n\r\n\r\nWe'll need the image to go through our promotion
pipeline to be tested\r\nvia
label.\r\n\r\nhttps://buildkite.com/elastic/kibana-elasticsearch-snapshot-build/builds/4673","sha":"17e72dd7ae43028ea481bbff417b85e8efebad39"}},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/198211","number":198211,"state":"MERGED","mergeCommit":{"sha":"3d8e498de039848988e2ba3810c550c8c805e95c","message":"[8.x]
[ci] Fix cloud deployments (#198086) (#198211)\n\n# Backport\n\nThis
will backport the following commits from `main` to `8.x`:\n- [[ci] Fix
cloud
deployments\n(#198086)](https://github.com/elastic/kibana/pull/198086)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT\n[{\"author\":{\"name\":\"Jon\",\"email\":\"jon@elastic.co\"},\"sourceCommit\":{\"committedDate\":\"2024-10-29T21:57:02Z\",\"message\":\"[ci]\nFix
cloud deployments (#198086)\\n\\nOur build scripts are relying on
a\nstep that was
removed\nin\\r\\nhttps://github.com/elastic/elasticsearch/pull/115357.
The image\nthat was\\r\\nproduced by this script is eventually consumed
by cloud\ndeployments from\\r\\npull requests.\\r\\n\\r\\nThis updates
our scripts to\nuse the cloud-ess variant instead. There\\r\\nshould not
be any functional\ndifference.\\r\\n\\r\\n\\r\\nWe'll need the image to
go through our promotion\npipeline to be
tested\\r\\nvia\nlabel.\\r\\n\\r\\nhttps://buildkite.com/elastic/kibana-elasticsearch-snapshot-build/builds/4673\",\"sha\":\"17e72dd7ae43028ea481bbff417b85e8efebad39\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.17.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"Team:Operations\",\"release_note:skip\",\"v9.0.0\",\"backport:prev-minor\"],\"title\":\"[ci]\nFix
cloud\ndeployments\",\"number\":198086,\"url\":\"https://github.com/elastic/kibana/pull/198086\",\"mergeCommit\":{\"message\":\"[ci]\nFix
cloud deployments (#198086)\\n\\nOur build scripts are relying on
a\nstep that was
removed\nin\\r\\nhttps://github.com/elastic/elasticsearch/pull/115357.
The image\nthat was\\r\\nproduced by this script is eventually consumed
by cloud\ndeployments from\\r\\npull requests.\\r\\n\\r\\nThis updates
our scripts to\nuse the cloud-ess variant instead. There\\r\\nshould not
be any functional\ndifference.\\r\\n\\r\\n\\r\\nWe'll need the image to
go through our promotion\npipeline to be
tested\\r\\nvia\nlabel.\\r\\n\\r\\nhttps://buildkite.com/elastic/kibana-elasticsearch-snapshot-build/builds/4673\",\"sha\":\"17e72dd7ae43028ea481bbff417b85e8efebad39\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/198086\",\"number\":198086,\"mergeCommit\":{\"message\":\"[ci]\nFix
cloud deployments (#198086)\\n\\nOur build scripts are relying on
a\nstep that was
removed\nin\\r\\nhttps://github.com/elastic/elasticsearch/pull/115357.
The image\nthat was\\r\\nproduced by this script is eventually consumed
by cloud\ndeployments from\\r\\npull requests.\\r\\n\\r\\nThis updates
our scripts to\nuse the cloud-ess variant instead. There\\r\\nshould not
be any functional\ndifference.\\r\\n\\r\\n\\r\\nWe'll need the image to
go through our promotion\npipeline to be
tested\\r\\nvia\nlabel.\\r\\n\\r\\nhttps://buildkite.com/elastic/kibana-elasticsearch-snapshot-build/builds/4673\",\"sha\":\"17e72dd7ae43028ea481bbff417b85e8efebad39\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Jon <jon@elastic.co>"}}]}] BACKPORT-->

Co-authored-by: Jon <jon@elastic.co>
This commit is contained in:
Kibana Machine 2024-12-19 08:49:11 +11:00 • committed by GitHub
parent 92f15a948a
commit 8b37460dbb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.buildkite/scripts/steps/cloud/build_and_deploy.sh
View file

@ -19,7 +19,7 @@ download_artifact "kibana-$VERSION-linux-x86_64.tar.gz" ./target --build "${KIBA
echo "--- Build Cloud Distribution"
ELASTICSEARCH_MANIFEST_URL="https://storage.googleapis.com/kibana-ci-es-snapshots-daily/$(jq -r '.version' package.json)/manifest-latest-verified.json"
ELASTICSEARCH_SHA=$(curl -s $ELASTICSEARCH_MANIFEST_URL | jq -r '.sha')
ELASTICSEARCH_CLOUD_IMAGE="docker.elastic.co/kibana-ci/elasticsearch-cloud:$VERSION-$ELASTICSEARCH_SHA"
ELASTICSEARCH_CLOUD_IMAGE="docker.elastic.co/kibana-ci/elasticsearch-cloud-ess:$VERSION-$ELASTICSEARCH_SHA"
KIBANA_CLOUD_IMAGE="docker.elastic.co/kibana-ci/kibana-cloud:$VERSION-$GIT_COMMIT"
CLOUD_DEPLOYMENT_NAME="kibana-pr-$BUILDKITE_PULL_REQUEST"

8
.buildkite/scripts/steps/es_snapshots/build.sh
View file

@ -85,11 +85,11 @@ echo "--- Create kibana-ci docker cloud image archives"
# When we bump versions, these dependencies may not exist yet, but we don't want to
# block the rest of the snapshot promotion process
set +e
./gradlew :distribution:docker:cloud-docker-export:assemble && {
ES_CLOUD_ID=$(docker images "docker.elastic.co/elasticsearch-ci/elasticsearch-cloud" --format "{{.ID}}")
ES_CLOUD_VERSION=$(docker images "docker.elastic.co/elasticsearch-ci/elasticsearch-cloud" --format "{{.Tag}}")
./gradlew :distribution:docker:cloud-ess-docker-export:assemble && {
ES_CLOUD_ID=$(docker images "docker.elastic.co/elasticsearch/elasticsearch-cloud-ess" --format "{{.ID}}")
ES_CLOUD_VERSION=$(docker images "docker.elastic.co/elasticsearch/elasticsearch-cloud-ess" --format "{{.Tag}}")
KIBANA_ES_CLOUD_VERSION="$ES_CLOUD_VERSION-$ELASTICSEARCH_GIT_COMMIT"
KIBANA_ES_CLOUD_IMAGE="docker.elastic.co/kibana-ci/elasticsearch-cloud:$KIBANA_ES_CLOUD_VERSION"
KIBANA_ES_CLOUD_IMAGE="docker.elastic.co/kibana-ci/elasticsearch-cloud-ess:$KIBANA_ES_CLOUD_VERSION"
echo $ES_CLOUD_ID $ES_CLOUD_VERSION $KIBANA_ES_CLOUD_VERSION $KIBANA_ES_CLOUD_IMAGE
docker tag "$ES_CLOUD_ID" "$KIBANA_ES_CLOUD_IMAGE"