Skip to content

Fix main-snapshot DRA alias lookup in minor-freeze wait#3071

Merged
edsavage merged 2 commits into
mainfrom
fix/dra-wait-main-alias
Jul 7, 2026
Merged

Fix main-snapshot DRA alias lookup in minor-freeze wait#3071
edsavage merged 2 commits into
mainfrom
fix/dra-wait-main-alias

Conversation

@jmlrt

@jmlrt jmlrt commented Jul 7, 2026

Copy link
Copy Markdown
Member

Describe your changes

dev-tools/wait_version_bump_dra.py's minor-freeze DRA wait polls .../latest/main.json for the main branch's post-bump snapshot version. That alias never gets created: release-manager's project-configs directory for main is named master, not main, so it only ever publishes the "latest" snapshot alias as .../latest/master.json. The wait would run until its 4h timeout and fail instead of resolving once the artifact is actually published.

Fix: poll .../latest/master.json directly for the main-snapshot check instead of the non-existent .../latest/main.json.

Observed on the 9.5.0 minor freeze: ml-cpp-version-bump #58 sat waiting on "main snapshot" even though the underlying main snapshot build (main-snapshot-builds #6665) had already passed and published latest/master.json with version 9.6.0-SNAPSHOT.

Added a regression test (test_wait_minor_polls_master_alias_for_main_snapshot) asserting the main-snapshot check polls latest/master.json and never references latest/main.json.

Test plan

  • ./dev-tools/run_dev_tools_tests.sh — 60 passed, 2 skipped (unrelated, pre-existing skips)
  • Manually verified against live artifacts: latest/main.json → 404, latest/master.json → 200 with version: "9.6.0-SNAPSHOT"

wait_version_bump_dra.py polled .../latest/main.json for the main
branch's snapshot version during minor-freeze DRA waits. release-manager
names its project-configs dir for main "master", so it only ever
publishes the branch-keyed "latest" snapshot alias as
.../latest/master.json — main.json never gets created, and the wait
times out after 4h instead of resolving once the artifact is published.

Fix by polling the version-keyed "latest" alias
(.../latest/{version}.json) for the main snapshot check instead, since
we already know the expected main version (MAIN_NEW_VERSION) and this
alias is unambiguous regardless of what release-manager calls the main
branch internally.

Observed on the 9.5.0 minor freeze: ml-cpp-version-bump #58 sat waiting
on "main snapshot" even though the underlying main snapshot build
(main-snapshot-builds #6665) had already passed and published
latest/master.json and latest/9.6.0-SNAPSHOT.json with version
9.6.0-SNAPSHOT.
@prodsecmachine

prodsecmachine commented Jul 7, 2026

Copy link
Copy Markdown

Snyk checks have passed. No issues have been found so far.

Status Scan Engine Critical High Medium Low Total (0)
Open Source Security 0 0 0 0 0 issues
Licenses 0 0 0 0 0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

@jmlrt jmlrt requested review from edsavage and ninalee12 July 7, 2026 16:15
@jmlrt jmlrt marked this pull request as ready for review July 7, 2026 16:16
Simpler fix: release-manager's project-configs dir for main is named
"master", so poll the branch-keyed alias it actually publishes
(latest/master.json) directly, rather than the version-keyed
latest/{version}.json alias.
@ninalee12 ninalee12 added the :ml label Jul 7, 2026
@elasticsearchmachine

Copy link
Copy Markdown

Pinging @elastic/ml-core (Team:ML)

@ninalee12 ninalee12 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Changes here look good to me. Not seeing anything that sticks out.

Verified that URL works as expected:

@edsavage edsavage left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@edsavage edsavage merged commit 085aa55 into main Jul 7, 2026
24 of 29 checks passed
@github-actions

github-actions Bot commented Jul 7, 2026

Copy link
Copy Markdown

💔 All backports failed

Status Branch Result
9.6 The branch "9.6" does not exist

Manual backport

To create the backport manually run:

backport --pr 3071

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants