File tree Expand file tree Collapse file tree 2 files changed +18
-0
lines changed Expand file tree Collapse file tree 2 files changed +18
-0
lines changed Original file line number Diff line number Diff line change 7
7
8
8
# The following images are defined here and their values will be updated by updatecli
9
9
# Please do not change them manually.
10
+ <<<<<<< HEAD
10
11
IMAGE_UBUNTU_2404_X86_64 : " platform-ingest-elastic-agent-ubuntu-2404-1748347205"
11
12
IMAGE_UBUNTU_2404_ARM_64 : " platform-ingest-elastic-agent-ubuntu-2404-aarch64-1748347205"
12
13
IMAGE_RHEL_8 : " platform-ingest-elastic-agent-rhel-8-1748347205"
13
14
IMAGE_DEBIAN_12 : " platform-ingest-elastic-agent-debian-12-1748347205"
14
15
IMAGE_WIN_2022 : " platform-ingest-elastic-agent-windows-2022-1748347205"
15
16
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))
16
25
17
26
steps :
18
27
- label : Start ESS stack for integration tests
Original file line number Diff line number Diff line change 6
6
7
7
# The following images are defined here and their values will be updated by updatecli
8
8
# Please do not change them manually.
9
+ <<<<<<< HEAD
9
10
IMAGE_UBUNTU_2204_X86_64 : " platform-ingest-elastic-agent-ubuntu-2204-1748347205"
10
11
IMAGE_UBUNTU_2204_ARM_64 : " platform-ingest-elastic-agent-ubuntu-2204-aarch64-1748347205"
11
12
IMAGE_WIN_2016 : " platform-ingest-elastic-agent-windows-2016-1748347205"
12
13
IMAGE_WIN_2022 : " platform-ingest-elastic-agent-windows-2022-1748347205"
13
14
IMAGE_WIN_10 : " platform-ingest-elastic-agent-windows-10-1748347205"
14
15
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))
15
24
16
25
steps :
17
26
- label : " check-ci"
You can’t perform that action at this time.
0 commit comments