From 95a310e69ab90308e0048e99312c31201ce1d16f Mon Sep 17 00:00:00 2001 From: Nina Lee Date: Wed, 11 Feb 2026 13:58:11 -0600 Subject: [PATCH 1/5] add DRA version bump pipeline --- .buildkite/pipeline.version-bump.yaml | 46 +++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .buildkite/pipeline.version-bump.yaml diff --git a/.buildkite/pipeline.version-bump.yaml b/.buildkite/pipeline.version-bump.yaml new file mode 100644 index 0000000000..6a4dbc8811 --- /dev/null +++ b/.buildkite/pipeline.version-bump.yaml @@ -0,0 +1,46 @@ +notify: + - slack: + channels: + - "#test-channel-for-plugin" + if: (build.branch == 'main' || build.branch =~ /^[0-9]+\.[0-9x]+\$/) && (build.state == 'passed' || build.state == 'failed') + - slack: + channels: + - "#test-channel-for-plugin" + message: "🚦 Pipeline waiting for approval 🚦\n*Ready to fetch DRA artifacts - Please unblock when ready.*" + if: build.state == "blocked" + +steps: + - block: "Ready to fetch for DRA artifacts?" + prompt: "Unblock when your team is ready to proceed." + key: block-get-dra-artifacts + blocked_state: running + + - label: "Fetch DRA Artifacts" + key: fetch-dra-artifacts + depends_on: block-get-dra-artifacts + agents: + image: docker.elastic.co/release-eng/ubuntu-build-essential-release-eng:latest + cpu: 2 + memory: 4G + ephemeralStorage: 10G + command: + - echo "Starting DRA artifacts retrieval..." + timeout_in_minutes: 240 + retry: + automatic: + - exit_status: "*" + limit: 2 + manual: + permit_on_passed: true + + plugins: + - elastic/json-watcher#v1.0.0: + url: "${STAGING_URL}" + field: "${FIELD}" + expected_value: "${EXPECTED_VALUE}" + polling_interval: "${POLLING_INTERVAL}" + - elastic/json-watcher#v1.0.0: + url: "${SNAPSHOT_URL}" + field: "${FIELD}" + expected_value: "${EXPECTED_VALUE}-SNAPSHOT" + polling_interval: "${POLLING_INTERVAL}" From 3017ba74528d41a0dc3d90d0789c4f5b7a722933 Mon Sep 17 00:00:00 2001 From: Nina Lee Date: Thu, 12 Feb 2026 12:54:25 -0600 Subject: [PATCH 2/5] update slack notification, update slack channel --- .buildkite/pipeline.version-bump.yaml | 28 ++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/.buildkite/pipeline.version-bump.yaml b/.buildkite/pipeline.version-bump.yaml index 6a4dbc8811..263e28cef8 100644 --- a/.buildkite/pipeline.version-bump.yaml +++ b/.buildkite/pipeline.version-bump.yaml @@ -1,17 +1,31 @@ notify: - slack: channels: - - "#test-channel-for-plugin" + - "#ingest-notifications" if: (build.branch == 'main' || build.branch =~ /^[0-9]+\.[0-9x]+\$/) && (build.state == 'passed' || build.state == 'failed') - slack: channels: - - "#test-channel-for-plugin" - message: "🚦 Pipeline waiting for approval 🚦\n*Ready to fetch DRA artifacts - Please unblock when ready.*" + - "#ingest-notifications" + message: | + 🚦 Pipeline waiting for approval 🚦 + Product: `${PRODUCT}` + + Ready to fetch DRA artifacts - please unblock when ready. + New version: `${NEW_VERSION}` + Branch: `${BRANCH}` + Workflow: `${WORKFLOW}` + ${BUILDKITE_BUILD_URL} if: build.state == "blocked" steps: - block: "Ready to fetch for DRA artifacts?" - prompt: "Unblock when your team is ready to proceed." + prompt: | + Unblock when your team is ready to proceed. + + Trigger parameters: + - NEW_VERSION: ${NEW_VERSION} + - BRANCH: ${BRANCH} + - WORKFLOW: ${WORKFLOW} key: block-get-dra-artifacts blocked_state: running @@ -37,10 +51,10 @@ steps: - elastic/json-watcher#v1.0.0: url: "${STAGING_URL}" field: "${FIELD}" - expected_value: "${EXPECTED_VALUE}" + expected_value: "${NEW_VERSION}" polling_interval: "${POLLING_INTERVAL}" - elastic/json-watcher#v1.0.0: url: "${SNAPSHOT_URL}" field: "${FIELD}" - expected_value: "${EXPECTED_VALUE}-SNAPSHOT" - polling_interval: "${POLLING_INTERVAL}" + expected_value: "${NEW_VERSION}-SNAPSHOT" + polling_interval: "${POLLING_INTERVAL}" \ No newline at end of file From 88b740b0ef69da317196fd0fd245aa9199891b16 Mon Sep 17 00:00:00 2001 From: Nina Lee Date: Fri, 13 Feb 2026 14:10:37 -0600 Subject: [PATCH 3/5] refactor variables --- .buildkite/pipeline.version-bump.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.buildkite/pipeline.version-bump.yaml b/.buildkite/pipeline.version-bump.yaml index 263e28cef8..56d300ad82 100644 --- a/.buildkite/pipeline.version-bump.yaml +++ b/.buildkite/pipeline.version-bump.yaml @@ -8,7 +8,7 @@ notify: - "#ingest-notifications" message: | 🚦 Pipeline waiting for approval 🚦 - Product: `${PRODUCT}` + Repo: `${REPO}` Ready to fetch DRA artifacts - please unblock when ready. New version: `${NEW_VERSION}` @@ -18,6 +18,7 @@ notify: if: build.state == "blocked" steps: + # TODO: replace this block step by real version bump logic - block: "Ready to fetch for DRA artifacts?" prompt: | Unblock when your team is ready to proceed. @@ -49,12 +50,12 @@ steps: plugins: - elastic/json-watcher#v1.0.0: - url: "${STAGING_URL}" - field: "${FIELD}" + url: "https://artifacts-staging.elastic.co/fleet-server/latest/${BRANCH}.json" + field: ".version" expected_value: "${NEW_VERSION}" - polling_interval: "${POLLING_INTERVAL}" + polling_interval: "30" - elastic/json-watcher#v1.0.0: - url: "${SNAPSHOT_URL}" - field: "${FIELD}" + url: "https://storage.googleapis.com/elastic-artifacts-snapshot/fleet-server/latest/${BRANCH}.json" + field: ".version" expected_value: "${NEW_VERSION}-SNAPSHOT" - polling_interval: "${POLLING_INTERVAL}" \ No newline at end of file + polling_interval: "30" From 077dffd6d65945b8e9d06ad518d5a5119960f510 Mon Sep 17 00:00:00 2001 From: Nina Lee Date: Fri, 13 Feb 2026 14:10:51 -0600 Subject: [PATCH 4/5] add version bump pipeline to catalog --- catalog-info.yaml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/catalog-info.yaml b/catalog-info.yaml index a145137db2..0cf69ce10c 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -213,3 +213,45 @@ spec: access_level: MANAGE_BUILD_AND_READ everyone: access_level: READ_ONLY + +--- +# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/e57ee3bed7a6f73077a3f55a38e76e40ec87a7cf/rre.schema.json +apiVersion: backstage.io/v1alpha1 +kind: Resource +metadata: + name: buildkite-pipeline-fleet-server-version-bump + description: Buildkite pipeline for the Elastic Fleet Server version bump + links: + - title: Pipeline + url: https://buildkite.com/elastic/fleet-server-version-bump + +spec: + type: buildkite-pipeline + owner: group:ingest-fp + system: buildkite + implementation: + apiVersion: buildkite.elastic.dev/v1 + kind: Pipeline + metadata: + name: fleet-server-version-bump + description: Buildkite pipeline for the Elastic Fleet Server version bump + spec: + repository: elastic/fleet-server + pipeline_file: ".buildkite/pipeline.version-bump.yaml" + provider_settings: + build_branches: false + build_pull_requests: false + trigger_mode: none + cancel_intermediate_builds: true + cancel_intermediate_builds_branch_filter: '!main !8.* !9.*' + skip_intermediate_builds: true + skip_intermediate_builds_branch_filter: '!main !8.* !9.*' + teams: + ingest-fp: + access_level: MANAGE_BUILD_AND_READ + observablt-ci: + access_level: MANAGE_BUILD_AND_READ + release-eng: + access_level: BUILD_AND_READ + everyone: + access_level: READ_ONLY \ No newline at end of file From 36b13f120584e630234435e111476db28d88defe Mon Sep 17 00:00:00 2001 From: Nina Lee Date: Thu, 19 Feb 2026 10:24:30 -0600 Subject: [PATCH 5/5] update image to use wolfi based container --- .buildkite/pipeline.version-bump.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.version-bump.yaml b/.buildkite/pipeline.version-bump.yaml index 56d300ad82..3bb84960df 100644 --- a/.buildkite/pipeline.version-bump.yaml +++ b/.buildkite/pipeline.version-bump.yaml @@ -34,7 +34,7 @@ steps: key: fetch-dra-artifacts depends_on: block-get-dra-artifacts agents: - image: docker.elastic.co/release-eng/ubuntu-build-essential-release-eng:latest + image: docker.elastic.co/release-eng/wolfi-build-essential-release-eng:latest cpu: 2 memory: 4G ephemeralStorage: 10G