Skip to content

Backport PR #17063 to 9.0: Use centralized source of truth for active branches#17072

Merged
mashhurs merged 5 commits intoelastic:9.0from
dliappis:bp/17063/to/9.0
Feb 12, 2025
Merged

Backport PR #17063 to 9.0: Use centralized source of truth for active branches#17072
mashhurs merged 5 commits intoelastic:9.0from
dliappis:bp/17063/to/9.0

Conversation

@dliappis
Copy link
Copy Markdown
Contributor

@dliappis dliappis commented Feb 12, 2025

Backport PR #17063 to 9.0 branch, original message:

Release notes

[rn:skip]

What does this PR do?

This commit simplifies the DRA process in Logstash by removing the need to maintain a separate file for the active branches, and instead rely on a centrally maintained file containing source of truth.
While at it, we refactor/simplify the creation of an array with the versions in .buildkite/scripts/snyk/resolve_stack_version.sh.

Why is it important/What is the impact to the user?

Removes a manual step required when new branches get cut.

How to test this PR locally

$ PIPELINES_TO_TRIGGER="test-pipeline" .buildkite/scripts/common/trigger-pipeline-generate-steps.sh 
--- Printing generated steps
steps:
  - trigger: test-pipeline
    label: ":testexecute: Triggering test-pipeline / 7.17"
    build:
      branch: "7.17"
      message: ":testexecute: Scheduled build for 7.17"
  - trigger: test-pipeline
    label: ":testexecute: Triggering test-pipeline / 8.x"
    build:
      branch: "8.x"
      message: ":testexecute: Scheduled build for 8.x"
  - trigger: test-pipeline
    label: ":testexecute: Triggering test-pipeline / 8.16"
    build:
      branch: "8.16"
      message: ":testexecute: Scheduled build for 8.16"
  - trigger: test-pipeline
    label: ":testexecute: Triggering test-pipeline / 8.17"
    build:
      branch: "8.17"
      message: ":testexecute: Scheduled build for 8.17"
  - trigger: test-pipeline
    label: ":testexecute: Triggering test-pipeline / 8.18"
    build:
      branch: "8.18"
      message: ":testexecute: Scheduled build for 8.18"
  - trigger: test-pipeline
    label: ":testexecute: Triggering test-pipeline / 9.0"
    build:
      branch: "9.0"
      message: ":testexecute: Scheduled build for 9.0"
  - trigger: test-pipeline
    label: ":testexecute: Triggering test-pipeline / main"
    build:
      branch: "main"
      message: ":testexecute: Scheduled build for main"
$ .buildkite/scripts/snyk/resolve_stack_version.sh 
Fetching versions from https://storage.googleapis.com/artifacts-api/snapshots/branches.json
7.17 8.x 8.16 8.17 8.18 9.0 main

Test in buildkite by triggering the scheduled pipeline: https://buildkite.com/elastic/logstash-pipeline-scheduler/builds/568#0194fa84-0a66-42d7-8806-d4610ce2abce/64-100

@dliappis dliappis self-assigned this Feb 12, 2025
@dliappis dliappis requested a review from mashhurs February 12, 2025 15:44
@dliappis
Copy link
Copy Markdown
Contributor Author

dliappis commented Feb 12, 2025

@mashhurs would appreciate a review of this backport as there were some conflicts with the cherry pick. AFAICS the changes are identical to #17063 which is what we want.

reakaleek and others added 4 commits February 12, 2025 17:47
@reakaleek @dliappis
github-action: Add AsciiDoc freeze warning (elastic#16969)
bf6a3fb
@mashhurs @dliappis
Add 9.0 branch to the CI branches definition (elastic#16997)
87d0e26
@mashhurs @dliappis
Core version bump to 9.1.0 (elastic#16991)
3bbf2f6
@dliappis
Use centralized source of truth for active branches (elastic#17063)
1863d37 
This commit simplifies the DRA process in Logstash by removing the need to maintain a separate file for the active branches, and instead rely on a centrally maintained file containing source of truth.
While at it, we refactor/simplify the creation of an array with the versions in `.buildkite/scripts/snyk/resolve_stack_version.sh`.
@dliappis dliappis mentioned this pull request Feb 12, 2025
Merged
@elastic-sonarqube
Copy link
Copy Markdown

elastic-sonarqube bot commented Feb 12, 2025

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Feb 12, 2025

💚 Build Succeeded

cc @dliappis

mashhurs
mashhurs approved these changes Feb 12, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@mashhurs mashhurs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@mashhurs mashhurs merged commit b982e36 into elastic:9.0 Feb 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mashhurs mashhurs mashhurs approved these changes

Assignees

@dliappis dliappis

Labels

backport ci

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dliappis @elasticmachine @mashhurs @reakaleek