From ebea81c9530a45f006ad20a557dfe651be5e7b3e Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Wed, 18 Jun 2025 15:37:00 -0400 Subject: [PATCH 1/2] [CI] Move default CI OS to ubuntu-2404 and drop ubuntu-2004 (#129008) (cherry picked from commit e53592e460f7fc8dc1436acf24a7c0fd02094521) # Conflicts: # .buildkite/pipelines/ecs-dynamic-template-tests.yml # .buildkite/pipelines/intake.template.yml # .buildkite/pipelines/intake.yml # .buildkite/pipelines/lucene-snapshot/build-snapshot.yml # .buildkite/pipelines/lucene-snapshot/run-tests.yml # .buildkite/pipelines/periodic-fwc.template.yml # .buildkite/pipelines/periodic-fwc.yml # .buildkite/pipelines/periodic-micro-benchmarks.yml # .buildkite/pipelines/periodic-packaging.template.yml # .buildkite/pipelines/periodic-packaging.yml # .buildkite/pipelines/periodic-platform-support.yml # .buildkite/pipelines/periodic.template.yml # .buildkite/pipelines/periodic.yml # .buildkite/pipelines/pull-request/bwc-snapshots.yml # .buildkite/pipelines/pull-request/packaging-tests-unix.yml # .buildkite/pipelines/pull-request/part-1-arm.yml # .buildkite/pipelines/pull-request/part-2-arm.yml # .buildkite/pipelines/pull-request/part-3-arm.yml # .buildkite/pipelines/pull-request/part-3-fips.yml # .buildkite/pipelines/pull-request/part-3.yml # .buildkite/pipelines/pull-request/part-4-arm.yml # .buildkite/pipelines/pull-request/part-4-fips.yml # .buildkite/pipelines/pull-request/part-4.yml # .buildkite/pipelines/pull-request/part-5-arm.yml # .buildkite/pipelines/pull-request/part-5-fips.yml # .buildkite/pipelines/pull-request/part-5.yml # .buildkite/pipelines/pull-request/release-tests.yml # .buildkite/pipelines/pull-request/rest-compatibility.yml --- .buildkite/pipelines/intake.template.yml | 6 +- .buildkite/pipelines/intake.yml | 6 +- .../periodic-packaging.bwc.template.yml | 2 +- .../pipelines/periodic-packaging.template.yml | 2 - .buildkite/pipelines/periodic-packaging.yml | 56 +++++++------ .../pipelines/periodic-platform-support.yml | 3 - .../pipelines/periodic.bwc.template.yml | 2 +- .buildkite/pipelines/periodic.template.yml | 26 +++--- .buildkite/pipelines/periodic.yml | 80 +++++++++---------- .../pull-request/build-benchmark.yml | 2 +- .../pipelines/pull-request/cloud-deploy.yml | 2 +- .../pipelines/pull-request/docs-check.yml | 2 +- .../pull-request/eql-correctness.yml | 2 +- .../pull-request/example-plugins.yml | 2 +- .../pipelines/pull-request/full-bwc.yml | 2 +- .../packaging-tests-unix-sample.yml | 2 +- .../pull-request/packaging-tests-unix.yml | 2 - .../pull-request/packaging-upgrade-tests.yml | 2 +- .../pipelines/pull-request/part-1-fips.yml | 2 +- .buildkite/pipelines/pull-request/part-1.yml | 2 +- .../pipelines/pull-request/part-2-fips.yml | 2 +- .buildkite/pipelines/pull-request/part-2.yml | 2 +- .../pipelines/pull-request/precommit.yml | 2 +- .../pipelines/pull-request/release-tests.yml | 23 ++++++ .../pull-request/validate-changelogs.yml | 2 +- .../__snapshots__/pipeline.test.ts.snap | 18 ++--- .../mocks/pipelines/bwc-snapshots.yml | 2 +- .../mocks/pipelines/docs-check.yml | 2 +- .../pull-request/mocks/pipelines/full-bwc.yml | 2 +- 29 files changed, 137 insertions(+), 123 deletions(-) diff --git a/.buildkite/pipelines/intake.template.yml b/.buildkite/pipelines/intake.template.yml index 954cdff683d20..880bbe2edfefe 100644 --- a/.buildkite/pipelines/intake.template.yml +++ b/.buildkite/pipelines/intake.template.yml @@ -4,7 +4,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk - wait @@ -13,7 +13,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk - label: part2 @@ -21,7 +21,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk - wait diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml index 763446c8425f7..c6f0503553727 100644 --- a/.buildkite/pipelines/intake.yml +++ b/.buildkite/pipelines/intake.yml @@ -5,7 +5,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk - wait @@ -14,7 +14,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk - label: part2 @@ -22,7 +22,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk - wait diff --git a/.buildkite/pipelines/periodic-packaging.bwc.template.yml b/.buildkite/pipelines/periodic-packaging.bwc.template.yml index b06bc80d3535d..40451aca58e67 100644 --- a/.buildkite/pipelines/periodic-packaging.bwc.template.yml +++ b/.buildkite/pipelines/periodic-packaging.bwc.template.yml @@ -5,7 +5,7 @@ setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} diff --git a/.buildkite/pipelines/periodic-packaging.template.yml b/.buildkite/pipelines/periodic-packaging.template.yml index 61425be74acea..5ff92c9dc1bc5 100644 --- a/.buildkite/pipelines/periodic-packaging.template.yml +++ b/.buildkite/pipelines/periodic-packaging.template.yml @@ -15,8 +15,6 @@ steps: - oraclelinux-9 - sles-12 - sles-15 - - ubuntu-1804 - - ubuntu-2004 - ubuntu-2204 - ubuntu-2404 - rocky-8 diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml index 1fb580dc21f99..03a2f9821fe9a 100644 --- a/.buildkite/pipelines/periodic-packaging.yml +++ b/.buildkite/pipelines/periodic-packaging.yml @@ -16,8 +16,6 @@ steps: - oraclelinux-9 - sles-12 - sles-15 - - ubuntu-1804 - - ubuntu-2004 - ubuntu-2204 - ubuntu-2404 - rocky-8 @@ -42,7 +40,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -58,7 +56,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -74,7 +72,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -90,7 +88,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -106,7 +104,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -122,7 +120,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -138,7 +136,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -154,7 +152,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -170,7 +168,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -186,7 +184,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -202,7 +200,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -218,7 +216,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -234,7 +232,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -250,7 +248,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -266,7 +264,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -282,7 +280,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -298,7 +296,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -314,7 +312,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -330,7 +328,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -346,7 +344,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -362,7 +360,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -378,7 +376,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -394,7 +392,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -410,7 +408,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -426,7 +424,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -442,7 +440,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} @@ -458,7 +456,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} diff --git a/.buildkite/pipelines/periodic-platform-support.yml b/.buildkite/pipelines/periodic-platform-support.yml index b3c369d6dcf50..6b9326c6eba4c 100644 --- a/.buildkite/pipelines/periodic-platform-support.yml +++ b/.buildkite/pipelines/periodic-platform-support.yml @@ -15,8 +15,6 @@ steps: - oraclelinux-9 - sles-12 - sles-15 - - ubuntu-1804 - - ubuntu-2004 - ubuntu-2204 - ubuntu-2404 - rocky-8 @@ -64,7 +62,6 @@ steps: setup: image: - almalinux-8-aarch64 - - ubuntu-2004-aarch64 - ubuntu-2404-aarch64 agents: provider: aws diff --git a/.buildkite/pipelines/periodic.bwc.template.yml b/.buildkite/pipelines/periodic.bwc.template.yml index 43a0a7438d656..0641e2e34778d 100644 --- a/.buildkite/pipelines/periodic.bwc.template.yml +++ b/.buildkite/pipelines/periodic.bwc.template.yml @@ -3,7 +3,7 @@ timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true diff --git a/.buildkite/pipelines/periodic.template.yml b/.buildkite/pipelines/periodic.template.yml index de36b3adae2be..78dca1a6dec24 100644 --- a/.buildkite/pipelines/periodic.template.yml +++ b/.buildkite/pipelines/periodic.template.yml @@ -6,7 +6,7 @@ steps: timeout_in_minutes: 420 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 diskSizeGb: 350 machineType: custom-32-98304 - label: eql-correctness @@ -14,7 +14,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk - label: example-plugins @@ -25,7 +25,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk - group: java-fips-matrix @@ -39,7 +39,7 @@ steps: - java11 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk env: @@ -70,7 +70,7 @@ steps: - openjdk23 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk env: @@ -80,7 +80,7 @@ steps: timeout_in_minutes: 360 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 diskSizeGb: 350 machineType: custom-32-98304 - group: third-party tests @@ -96,7 +96,7 @@ steps: timeout_in_minutes: 30 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n2-standard-8 buildDirectory: /dev/shm/bk - label: third-party / azure @@ -110,7 +110,7 @@ steps: timeout_in_minutes: 30 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n2-standard-8 buildDirectory: /dev/shm/bk - label: third-party / gcs @@ -124,7 +124,7 @@ steps: timeout_in_minutes: 30 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n2-standard-8 buildDirectory: /dev/shm/bk - label: third-party / geoip @@ -133,7 +133,7 @@ steps: timeout_in_minutes: 30 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n2-standard-8 buildDirectory: /dev/shm/bk - label: third-party / s3 @@ -147,7 +147,7 @@ steps: timeout_in_minutes: 30 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n2-standard-8 buildDirectory: /dev/shm/bk - label: Upload Snyk Dependency Graph @@ -157,7 +157,7 @@ steps: timeout_in_minutes: 20 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n2-standard-8 buildDirectory: /dev/shm/bk if: build.branch == "main" || build.branch == "7.17" @@ -166,7 +166,7 @@ steps: timeout_in_minutes: 15 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n2-standard-2 - label: check-branch-protection-rules command: .buildkite/scripts/branch-protection.sh diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml index d0d4d53f94e53..7fb2c3f5da459 100644 --- a/.buildkite/pipelines/periodic.yml +++ b/.buildkite/pipelines/periodic.yml @@ -7,7 +7,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -26,7 +26,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -45,7 +45,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -64,7 +64,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -83,7 +83,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -102,7 +102,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -121,7 +121,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -140,7 +140,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -159,7 +159,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -178,7 +178,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -197,7 +197,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -216,7 +216,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -235,7 +235,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -254,7 +254,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -273,7 +273,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -292,7 +292,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -311,7 +311,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -330,7 +330,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -349,7 +349,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -368,7 +368,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -387,7 +387,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -406,7 +406,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -425,7 +425,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -444,7 +444,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -463,7 +463,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -482,7 +482,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -501,7 +501,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk preemptible: true @@ -520,7 +520,7 @@ steps: timeout_in_minutes: 420 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 diskSizeGb: 350 machineType: custom-32-98304 - label: eql-correctness @@ -528,7 +528,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk - label: example-plugins @@ -539,7 +539,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk - group: java-fips-matrix @@ -553,7 +553,7 @@ steps: - java11 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk env: @@ -584,7 +584,7 @@ steps: - openjdk23 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n1-standard-32 buildDirectory: /dev/shm/bk env: @@ -594,7 +594,7 @@ steps: timeout_in_minutes: 360 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 diskSizeGb: 350 machineType: custom-32-98304 - group: third-party tests @@ -610,7 +610,7 @@ steps: timeout_in_minutes: 30 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n2-standard-8 buildDirectory: /dev/shm/bk - label: third-party / azure @@ -624,7 +624,7 @@ steps: timeout_in_minutes: 30 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n2-standard-8 buildDirectory: /dev/shm/bk - label: third-party / gcs @@ -638,7 +638,7 @@ steps: timeout_in_minutes: 30 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n2-standard-8 buildDirectory: /dev/shm/bk - label: third-party / geoip @@ -647,7 +647,7 @@ steps: timeout_in_minutes: 30 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n2-standard-8 buildDirectory: /dev/shm/bk - label: third-party / s3 @@ -661,7 +661,7 @@ steps: timeout_in_minutes: 30 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n2-standard-8 buildDirectory: /dev/shm/bk - label: Upload Snyk Dependency Graph @@ -671,7 +671,7 @@ steps: timeout_in_minutes: 20 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n2-standard-8 buildDirectory: /dev/shm/bk if: build.branch == "main" || build.branch == "7.17" @@ -680,7 +680,7 @@ steps: timeout_in_minutes: 15 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: n2-standard-2 - label: check-branch-protection-rules command: .buildkite/scripts/branch-protection.sh diff --git a/.buildkite/pipelines/pull-request/build-benchmark.yml b/.buildkite/pipelines/pull-request/build-benchmark.yml index 8d3215b8393ce..09ed5d7216033 100644 --- a/.buildkite/pipelines/pull-request/build-benchmark.yml +++ b/.buildkite/pipelines/pull-request/build-benchmark.yml @@ -19,6 +19,6 @@ steps: BUILD_PERFORMANCE_TEST: "true" agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk diff --git a/.buildkite/pipelines/pull-request/cloud-deploy.yml b/.buildkite/pipelines/pull-request/cloud-deploy.yml index ce8e8206d51ff..b007e60f3e433 100644 --- a/.buildkite/pipelines/pull-request/cloud-deploy.yml +++ b/.buildkite/pipelines/pull-request/cloud-deploy.yml @@ -8,6 +8,6 @@ steps: timeout_in_minutes: 20 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk diff --git a/.buildkite/pipelines/pull-request/docs-check.yml b/.buildkite/pipelines/pull-request/docs-check.yml index 2201eb2d1e4ea..9d3e92508210b 100644 --- a/.buildkite/pipelines/pull-request/docs-check.yml +++ b/.buildkite/pipelines/pull-request/docs-check.yml @@ -9,6 +9,6 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk diff --git a/.buildkite/pipelines/pull-request/eql-correctness.yml b/.buildkite/pipelines/pull-request/eql-correctness.yml index 8f7ca6942c0e9..09d946bcf8db9 100644 --- a/.buildkite/pipelines/pull-request/eql-correctness.yml +++ b/.buildkite/pipelines/pull-request/eql-correctness.yml @@ -4,6 +4,6 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk diff --git a/.buildkite/pipelines/pull-request/example-plugins.yml b/.buildkite/pipelines/pull-request/example-plugins.yml index 18d0de6594980..f745fe2c6ad1f 100644 --- a/.buildkite/pipelines/pull-request/example-plugins.yml +++ b/.buildkite/pipelines/pull-request/example-plugins.yml @@ -13,6 +13,6 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk diff --git a/.buildkite/pipelines/pull-request/full-bwc.yml b/.buildkite/pipelines/pull-request/full-bwc.yml index d3fa8eccaf7d9..6c9455d589e6d 100644 --- a/.buildkite/pipelines/pull-request/full-bwc.yml +++ b/.buildkite/pipelines/pull-request/full-bwc.yml @@ -10,6 +10,6 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk diff --git a/.buildkite/pipelines/pull-request/packaging-tests-unix-sample.yml b/.buildkite/pipelines/pull-request/packaging-tests-unix-sample.yml index 98bc61ea33738..a29653af289c1 100644 --- a/.buildkite/pipelines/pull-request/packaging-tests-unix-sample.yml +++ b/.buildkite/pipelines/pull-request/packaging-tests-unix-sample.yml @@ -13,7 +13,7 @@ steps: setup: image: - rhel-8 - - ubuntu-2004 + - ubuntu-2404 PACKAGING_TASK: - destructiveDistroTest.docker - destructiveDistroTest.packages diff --git a/.buildkite/pipelines/pull-request/packaging-tests-unix.yml b/.buildkite/pipelines/pull-request/packaging-tests-unix.yml index 0ec2cddde4105..423633c267776 100644 --- a/.buildkite/pipelines/pull-request/packaging-tests-unix.yml +++ b/.buildkite/pipelines/pull-request/packaging-tests-unix.yml @@ -18,8 +18,6 @@ steps: - oraclelinux-9 - sles-12 - sles-15 - - ubuntu-1804 - - ubuntu-2004 - ubuntu-2204 - ubuntu-2404 - rocky-8 diff --git a/.buildkite/pipelines/pull-request/packaging-upgrade-tests.yml b/.buildkite/pipelines/pull-request/packaging-upgrade-tests.yml index c62cf23310422..c19ba8bea66a2 100644 --- a/.buildkite/pipelines/pull-request/packaging-upgrade-tests.yml +++ b/.buildkite/pipelines/pull-request/packaging-upgrade-tests.yml @@ -12,7 +12,7 @@ steps: setup: image: - rocky-8 - - ubuntu-2004 + - ubuntu-2404 agents: provider: gcp image: family/elasticsearch-{{matrix.image}} diff --git a/.buildkite/pipelines/pull-request/part-1-fips.yml b/.buildkite/pipelines/pull-request/part-1-fips.yml index 42f930c1bde9a..cde9f37205645 100644 --- a/.buildkite/pipelines/pull-request/part-1-fips.yml +++ b/.buildkite/pipelines/pull-request/part-1-fips.yml @@ -6,6 +6,6 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk diff --git a/.buildkite/pipelines/pull-request/part-1.yml b/.buildkite/pipelines/pull-request/part-1.yml index 7a09e2a162ff8..f101923e4a828 100644 --- a/.buildkite/pipelines/pull-request/part-1.yml +++ b/.buildkite/pipelines/pull-request/part-1.yml @@ -6,6 +6,6 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk diff --git a/.buildkite/pipelines/pull-request/part-2-fips.yml b/.buildkite/pipelines/pull-request/part-2-fips.yml index 6a3647ceb50ae..2b0b18864955f 100644 --- a/.buildkite/pipelines/pull-request/part-2-fips.yml +++ b/.buildkite/pipelines/pull-request/part-2-fips.yml @@ -6,6 +6,6 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk diff --git a/.buildkite/pipelines/pull-request/part-2.yml b/.buildkite/pipelines/pull-request/part-2.yml index 43de69bbcd945..4b3b04360f253 100644 --- a/.buildkite/pipelines/pull-request/part-2.yml +++ b/.buildkite/pipelines/pull-request/part-2.yml @@ -4,6 +4,6 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk diff --git a/.buildkite/pipelines/pull-request/precommit.yml b/.buildkite/pipelines/pull-request/precommit.yml index 1763758932581..7c16ad6311033 100644 --- a/.buildkite/pipelines/pull-request/precommit.yml +++ b/.buildkite/pipelines/pull-request/precommit.yml @@ -9,6 +9,6 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk diff --git a/.buildkite/pipelines/pull-request/release-tests.yml b/.buildkite/pipelines/pull-request/release-tests.yml index 7d7a5c77d3320..a883537492002 100644 --- a/.buildkite/pipelines/pull-request/release-tests.yml +++ b/.buildkite/pipelines/pull-request/release-tests.yml @@ -1,6 +1,7 @@ config: allow-labels: test-release steps: +<<<<<<< HEAD - label: release-tests command: .buildkite/scripts/release-tests.sh timeout_in_minutes: 300 @@ -9,3 +10,25 @@ steps: image: family/elasticsearch-ubuntu-2004 diskSizeGb: 350 machineType: custom-32-98304 +======= + - group: release-tests + steps: + - label: "{{matrix.CHECK_TASK}} / release-tests" + key: "packaging-tests-unix" + command: .buildkite/scripts/release-tests.sh {{matrix.CHECK_TASK}} + timeout_in_minutes: 120 + matrix: + setup: + CHECK_TASK: + - checkPart1 + - checkPart2 + - checkPart3 + - checkPart4 + - checkPart5 + - checkPart6 + agents: + provider: gcp + image: family/elasticsearch-ubuntu-2404 + diskSizeGb: 350 + machineType: custom-32-98304 +>>>>>>> e53592e460f ([CI] Move default CI OS to ubuntu-2404 and drop ubuntu-2004 (#129008)) diff --git a/.buildkite/pipelines/pull-request/validate-changelogs.yml b/.buildkite/pipelines/pull-request/validate-changelogs.yml index 9451d321a9b39..718222d82859b 100644 --- a/.buildkite/pipelines/pull-request/validate-changelogs.yml +++ b/.buildkite/pipelines/pull-request/validate-changelogs.yml @@ -4,6 +4,6 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk diff --git a/.buildkite/scripts/pull-request/__snapshots__/pipeline.test.ts.snap b/.buildkite/scripts/pull-request/__snapshots__/pipeline.test.ts.snap index 50dea7a07e042..df00efdbaf102 100644 --- a/.buildkite/scripts/pull-request/__snapshots__/pipeline.test.ts.snap +++ b/.buildkite/scripts/pull-request/__snapshots__/pipeline.test.ts.snap @@ -12,7 +12,7 @@ exports[`generatePipelines should generate correct pipelines with a non-docs cha { "agents": { "buildDirectory": "/dev/shm/bk", - "image": "family/elasticsearch-ubuntu-2004", + "image": "family/elasticsearch-ubuntu-2404", "machineType": "custom-32-98304", "provider": "gcp", }, @@ -63,7 +63,7 @@ exports[`generatePipelines should generate correct pipelines with only docs chan { "agents": { "buildDirectory": "/dev/shm/bk", - "image": "family/elasticsearch-ubuntu-2004", + "image": "family/elasticsearch-ubuntu-2404", "machineType": "custom-32-98304", "provider": "gcp", }, @@ -89,7 +89,7 @@ exports[`generatePipelines should generate correct pipelines with full BWC expan { "agents": { "buildDirectory": "/dev/shm/bk", - "image": "family/elasticsearch-ubuntu-2004", + "image": "family/elasticsearch-ubuntu-2404", "machineType": "custom-32-98304", "provider": "gcp", }, @@ -104,7 +104,7 @@ exports[`generatePipelines should generate correct pipelines with full BWC expan { "agents": { "buildDirectory": "/dev/shm/bk", - "image": "family/elasticsearch-ubuntu-2004", + "image": "family/elasticsearch-ubuntu-2404", "machineType": "custom-32-98304", "provider": "gcp", }, @@ -119,7 +119,7 @@ exports[`generatePipelines should generate correct pipelines with full BWC expan { "agents": { "buildDirectory": "/dev/shm/bk", - "image": "family/elasticsearch-ubuntu-2004", + "image": "family/elasticsearch-ubuntu-2404", "machineType": "custom-32-98304", "provider": "gcp", }, @@ -134,7 +134,7 @@ exports[`generatePipelines should generate correct pipelines with full BWC expan { "agents": { "buildDirectory": "/dev/shm/bk", - "image": "family/elasticsearch-ubuntu-2004", + "image": "family/elasticsearch-ubuntu-2404", "machineType": "custom-32-98304", "provider": "gcp", }, @@ -149,7 +149,7 @@ exports[`generatePipelines should generate correct pipelines with full BWC expan { "agents": { "buildDirectory": "/dev/shm/bk", - "image": "family/elasticsearch-ubuntu-2004", + "image": "family/elasticsearch-ubuntu-2404", "machineType": "custom-32-98304", "provider": "gcp", }, @@ -214,7 +214,7 @@ exports[`generatePipelines should generate correct pipelines with a non-docs cha { "agents": { "buildDirectory": "/dev/shm/bk", - "image": "family/elasticsearch-ubuntu-2004", + "image": "family/elasticsearch-ubuntu-2404", "machineType": "custom-32-98304", "provider": "gcp", }, @@ -268,7 +268,7 @@ exports[`generatePipelines should generate correct pipelines with a non-docs cha { "agents": { "buildDirectory": "/dev/shm/bk", - "image": "family/elasticsearch-ubuntu-2004", + "image": "family/elasticsearch-ubuntu-2404", "machineType": "custom-32-98304", "provider": "gcp", }, diff --git a/.buildkite/scripts/pull-request/mocks/pipelines/bwc-snapshots.yml b/.buildkite/scripts/pull-request/mocks/pipelines/bwc-snapshots.yml index 0f549ed9f1195..cad69eba7e905 100644 --- a/.buildkite/scripts/pull-request/mocks/pipelines/bwc-snapshots.yml +++ b/.buildkite/scripts/pull-request/mocks/pipelines/bwc-snapshots.yml @@ -14,7 +14,7 @@ steps: BWC_VERSION: $SNAPSHOT_BWC_VERSIONS agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk env: diff --git a/.buildkite/scripts/pull-request/mocks/pipelines/docs-check.yml b/.buildkite/scripts/pull-request/mocks/pipelines/docs-check.yml index 2201eb2d1e4ea..9d3e92508210b 100644 --- a/.buildkite/scripts/pull-request/mocks/pipelines/docs-check.yml +++ b/.buildkite/scripts/pull-request/mocks/pipelines/docs-check.yml @@ -9,6 +9,6 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk diff --git a/.buildkite/scripts/pull-request/mocks/pipelines/full-bwc.yml b/.buildkite/scripts/pull-request/mocks/pipelines/full-bwc.yml index 2737597815ad0..073054ca7bbe4 100644 --- a/.buildkite/scripts/pull-request/mocks/pipelines/full-bwc.yml +++ b/.buildkite/scripts/pull-request/mocks/pipelines/full-bwc.yml @@ -10,7 +10,7 @@ steps: timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 machineType: custom-32-98304 buildDirectory: /dev/shm/bk env: From 3c9c7237f0e810d1844a7bcce7d2cec798502b67 Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Wed, 18 Jun 2025 16:26:35 -0400 Subject: [PATCH 2/2] Update release-tests.yml --- .../pipelines/pull-request/release-tests.yml | 25 +------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/.buildkite/pipelines/pull-request/release-tests.yml b/.buildkite/pipelines/pull-request/release-tests.yml index a883537492002..e61525282939a 100644 --- a/.buildkite/pipelines/pull-request/release-tests.yml +++ b/.buildkite/pipelines/pull-request/release-tests.yml @@ -1,34 +1,11 @@ config: allow-labels: test-release steps: -<<<<<<< HEAD - label: release-tests command: .buildkite/scripts/release-tests.sh timeout_in_minutes: 300 agents: provider: gcp - image: family/elasticsearch-ubuntu-2004 + image: family/elasticsearch-ubuntu-2404 diskSizeGb: 350 machineType: custom-32-98304 -======= - - group: release-tests - steps: - - label: "{{matrix.CHECK_TASK}} / release-tests" - key: "packaging-tests-unix" - command: .buildkite/scripts/release-tests.sh {{matrix.CHECK_TASK}} - timeout_in_minutes: 120 - matrix: - setup: - CHECK_TASK: - - checkPart1 - - checkPart2 - - checkPart3 - - checkPart4 - - checkPart5 - - checkPart6 - agents: - provider: gcp - image: family/elasticsearch-ubuntu-2404 - diskSizeGb: 350 - machineType: custom-32-98304 ->>>>>>> e53592e460f ([CI] Move default CI OS to ubuntu-2404 and drop ubuntu-2004 (#129008))