From ea0c16870f56894cbdb7a838e1b0b9c1af757e42 Mon Sep 17 00:00:00 2001 From: Dimitrios Liappis Date: Mon, 8 Jul 2024 14:43:55 +0300 Subject: [PATCH] Add Ubuntu 24.04 to CI (#16299) Now that we have custom VM images for Ubuntu 24.04, this commit adds CI for Ubuntu 24.04. This is a revert of #16279 --- .buildkite/linux_jdk_matrix_pipeline.yml | 2 ++ .buildkite/scripts/common/vm-images.json | 2 +- .buildkite/scripts/exhaustive-tests/generate-steps.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.buildkite/linux_jdk_matrix_pipeline.yml b/.buildkite/linux_jdk_matrix_pipeline.yml index 40096683867..feebfe95b69 100644 --- a/.buildkite/linux_jdk_matrix_pipeline.yml +++ b/.buildkite/linux_jdk_matrix_pipeline.yml @@ -18,6 +18,8 @@ steps: multiple: true default: "${DEFAULT_MATRIX_OS}" options: + - label: "Ubuntu 24.04" + value: "ubuntu-2404" - label: "Ubuntu 22.04" value: "ubuntu-2204" - label: "Ubuntu 20.04" diff --git a/.buildkite/scripts/common/vm-images.json b/.buildkite/scripts/common/vm-images.json index 6d34fb2a1a7..50d48dcfbbe 100644 --- a/.buildkite/scripts/common/vm-images.json +++ b/.buildkite/scripts/common/vm-images.json @@ -1,7 +1,7 @@ { "#comment": "This file lists all custom vm images. We use it to make decisions about randomized CI jobs.", "linux": { - "ubuntu": ["ubuntu-2204", "ubuntu-2004"], + "ubuntu": ["ubuntu-2404", "ubuntu-2204", "ubuntu-2004"], "debian": ["debian-12", "debian-11", "debian-10"], "rhel": ["rhel-9", "rhel-8"], "oraclelinux": ["oraclelinux-8", "oraclelinux-7"], diff --git a/.buildkite/scripts/exhaustive-tests/generate-steps.py b/.buildkite/scripts/exhaustive-tests/generate-steps.py index ac16b12342f..391cb4fadc6 100644 --- a/.buildkite/scripts/exhaustive-tests/generate-steps.py +++ b/.buildkite/scripts/exhaustive-tests/generate-steps.py @@ -10,7 +10,7 @@ VM_IMAGES_FILE = ".buildkite/scripts/common/vm-images.json" VM_IMAGE_PREFIX = "platform-ingest-logstash-multi-jdk-" -ACCEPTANCE_LINUX_OSES = ["ubuntu-2204", "ubuntu-2004", "debian-11", "debian-10", "rhel-8", "oraclelinux-7", "rocky-linux-8", "opensuse-leap-15", "amazonlinux-2023"] +ACCEPTANCE_LINUX_OSES = ["ubuntu-2404", "ubuntu-2204", "ubuntu-2004", "debian-11", "debian-10", "rhel-8", "oraclelinux-7", "rocky-linux-8", "opensuse-leap-15", "amazonlinux-2023"] CUR_PATH = os.path.dirname(os.path.abspath(__file__))