Skip to content

Commit bb36a12

Browse files
github-actions[bot]mergify[bot]
authored andcommitted
[Automation] Bump VM Image version to 1749258065 (#8390)
(cherry picked from commit 2218d36) # Conflicts: # .buildkite/bk.integration.pipeline.yml # .buildkite/pipeline.yml
1 parent 1e08066 commit bb36a12

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

.buildkite/bk.integration.pipeline.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,21 @@ env:
77

88
# The following images are defined here and their values will be updated by updatecli
99
# Please do not change them manually.
10+
<<<<<<< HEAD
1011
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1748347205"
1112
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1748347205"
1213
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1748347205"
1314
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1748347205"
1415
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1748347205"
1516
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1748347205"
17+
=======
18+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1749258065"
19+
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1749258065"
20+
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1749258065"
21+
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1749258065"
22+
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1749258065"
23+
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1749258065"
24+
>>>>>>> 2218d364b ([Automation] Bump VM Image version to 1749258065 (#8390))
1625

1726
steps:
1827
- label: Start ESS stack for integration tests

.buildkite/pipeline.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,21 @@ env:
66

77
# The following images are defined here and their values will be updated by updatecli
88
# Please do not change them manually.
9+
<<<<<<< HEAD
910
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1748347205"
1011
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1748347205"
1112
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1748347205"
1213
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1748347205"
1314
IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1748347205"
1415
IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1748347205"
16+
=======
17+
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1749258065"
18+
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1749258065"
19+
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1749258065"
20+
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1749258065"
21+
IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1749258065"
22+
IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1749258065"
23+
>>>>>>> 2218d364b ([Automation] Bump VM Image version to 1749258065 (#8390))
1524

1625
steps:
1726
- label: "check-ci"

0 commit comments

Comments
 (0)