Use centralized version qualifier #16995
Conversation
To avoid manual invocations specifying the version qualifier for prereleases in this commit we leverage a centralized version of truth for the version qualifier. We also honor the `DRA_BRANCH` BK var for the generated step names (the functionality was already there, it's just a cosmetic improvement).
| Return the version qualifier from a centralized URL based on branch. For any failure or response apart from 200, | ||
| assume no qualifier (return empty string). | ||
| """ | ||
| url = f"https://storage.googleapis.com/dra-qualifier/{branch}" |
| if response.status == 200: | ||
| return response.data.decode("utf-8").strip() | ||
| except HTTPError as e: | ||
| pass |
|
|
||
| branch = os.environ["BUILDKITE_BRANCH"] | ||
| # allow manually set version qualifier via BK env vars (should be rarely used, only for testing) | ||
| version_qualifier = os.environ.get("VERSION_QUALIFIER", "") |
There was a problem hiding this comment.
+1 for keeping environment var
|
Thank you for the quick review @mashhurs ! Once we've merged it everywhere, we can clean up the docs for using |
Agreed! I was just checking the doc and if we reflect current automated qualifier detection (check the URL if qualifier is missed) and using |
|
💚 Build Succeeded
cc @dliappis |
|
@logstashmachine backport 8.x |
|
@logstashmachine backport 8.17 |
|
@logstashmachine backport 8.16 |
To avoid manual invocations specifying the version qualifier for prereleases in this commit we leverage a centralized version of truth for the version qualifier. We also honor the `DRA_BRANCH` BK var for the generated step names (the functionality was already there, it's just a cosmetic improvement). (cherry picked from commit ac56d99)
To avoid manual invocations specifying the version qualifier for prereleases in this commit we leverage a centralized version of truth for the version qualifier. We also honor the `DRA_BRANCH` BK var for the generated step names (the functionality was already there, it's just a cosmetic improvement). (cherry picked from commit ac56d99)
To avoid manual invocations specifying the version qualifier for prereleases in this commit we leverage a centralized version of truth for the version qualifier. We also honor the `DRA_BRANCH` BK var for the generated step names (the functionality was already there, it's just a cosmetic improvement). (cherry picked from commit ac56d99)
To avoid manual invocations specifying the version qualifier for prereleases in this commit we leverage a centralized version of truth for the version qualifier. We also honor the `DRA_BRANCH` BK var for the generated step names (the functionality was already there, it's just a cosmetic improvement).
|
I am reverting this because testing reveals that even an empty
|
This reverts commit ac56d99. As mentioned in #16995 (comment) testing revealed that even an empty VERSION_QUALIFIER env var currently gets honored for snapshot builds (resulting in an unnecessary empty "-" suffix) so there's a little more prerequisite work needed.
3 participants
Release notes
[rn:skip]
What does this PR do?
To avoid manual invocations specifying the version qualifier for prereleases in this commit we leverage a centralized version of truth for the version qualifier.
We also honor the
DRA_BRANCHBK var for the generated step names (the functionality was already there, it's just a cosmetic improvement).Why is it important/What is the impact to the user?
Removes the need to specify VERSION_QUALIFIER when building DRA (staging) artifacts entirely.
How to test this PR locally
Can only be tested in BK. Links to be provided:
NOTE This is raised against 9.0 because it's the immediate need, and should be forward ported to
main, as well as backported to all 8.x branches.