Skip to content

Revert "Use centralized version qualifier" #17006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jan 31, 2025
Merged

Revert "Use centralized version qualifier" #17006

merged 1 commit into from
Jan 31, 2025
+14 −54

Conversation

@dliappis
Copy link
Contributor

@dliappis dliappis commented Jan 31, 2025 •
edited
Loading

Reverts #16995

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.

@dliappis dliappis added the ci label Jan 31, 2025
@elastic-sonarqube
Copy link

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
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

@dliappis dliappis requested review from andsel and mashhurs January 31, 2025 11:02
jsvd
jsvd approved these changes Jan 31, 2025
View reviewed changes
Copy link
Member

@jsvd jsvd left a comment

Choose a reason for hiding this comment

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

LGTM

@dliappis dliappis merged commit f8f53d1 into 9.0 Jan 31, 2025
7 checks passed
@dliappis dliappis deleted the revert-16995-centralized-version-for-version-qualifier branch January 31, 2025 12:17
dliappis added a commit that referenced this pull request Feb 7, 2025
@dliappis @andsel
Don't honor VERSION_QUALIFIER if set but empty (#17032)
c7204fd 
PR #17006 revealed that the `VERSION_QUALIFIER` env var gets honored in
various scripts when present but empty.
This shouldn't be the case as the DRA process is designed to gracefully
ignore empty values for this variable.

This commit changes various ruby scripts to not treat "" as truthy.
Bash scripts (used by CI etc.) are already ok with this as part of
refactorings done in #16907.

---------

Co-authored-by: Andrea Selva <[email protected]>
github-actions bot pushed a commit that referenced this pull request Feb 7, 2025
@dliappis @andsel @logstashmachine
Don't honor VERSION_QUALIFIER if set but empty (#17032)
47dff33 
PR #17006 revealed that the `VERSION_QUALIFIER` env var gets honored in
various scripts when present but empty.
This shouldn't be the case as the DRA process is designed to gracefully
ignore empty values for this variable.

This commit changes various ruby scripts to not treat "" as truthy.
Bash scripts (used by CI etc.) are already ok with this as part of
refactorings done in #16907.

---------

Co-authored-by: Andrea Selva <[email protected]>
(cherry picked from commit c7204fd)
dliappis added a commit that referenced this pull request Feb 7, 2025
@github-actions @dliappis
Don't honor VERSION_QUALIFIER if set but empty (#17032) (#17034)
8c32a46 
PR #17006 revealed that the `VERSION_QUALIFIER` env var gets honored in
various scripts when present but empty.
This shouldn't be the case as the DRA process is designed to gracefully
ignore empty values for this variable.

This commit changes various ruby scripts to not treat "" as truthy.
Bash scripts (used by CI etc.) are already ok with this as part of
refactorings done in #16907.

---------

Co-authored-by: Andrea Selva <[email protected]>
(cherry picked from commit c7204fd)

Co-authored-by: Dimitrios Liappis <[email protected]>
github-actions bot pushed a commit that referenced this pull request Feb 12, 2025
@dliappis @andsel @logstashmachine
Don't honor VERSION_QUALIFIER if set but empty (#17032)
9df91bd 
PR #17006 revealed that the `VERSION_QUALIFIER` env var gets honored in
various scripts when present but empty.
This shouldn't be the case as the DRA process is designed to gracefully
ignore empty values for this variable.

This commit changes various ruby scripts to not treat "" as truthy.
Bash scripts (used by CI etc.) are already ok with this as part of
refactorings done in #16907.

---------

Co-authored-by: Andrea Selva <[email protected]>
(cherry picked from commit c7204fd)
github-actions bot pushed a commit that referenced this pull request Feb 12, 2025
@dliappis @andsel @logstashmachine
Don't honor VERSION_QUALIFIER if set but empty (#17032)
81bdeac 
PR #17006 revealed that the `VERSION_QUALIFIER` env var gets honored in
various scripts when present but empty.
This shouldn't be the case as the DRA process is designed to gracefully
ignore empty values for this variable.

This commit changes various ruby scripts to not treat "" as truthy.
Bash scripts (used by CI etc.) are already ok with this as part of
refactorings done in #16907.

---------

Co-authored-by: Andrea Selva <[email protected]>
(cherry picked from commit c7204fd)
github-actions bot pushed a commit that referenced this pull request Feb 12, 2025
@dliappis @andsel @logstashmachine
Don't honor VERSION_QUALIFIER if set but empty (#17032)
9de926d 
PR #17006 revealed that the `VERSION_QUALIFIER` env var gets honored in
various scripts when present but empty.
This shouldn't be the case as the DRA process is designed to gracefully
ignore empty values for this variable.

This commit changes various ruby scripts to not treat "" as truthy.
Bash scripts (used by CI etc.) are already ok with this as part of
refactorings done in #16907.

---------

Co-authored-by: Andrea Selva <[email protected]>
(cherry picked from commit c7204fd)
github-actions bot pushed a commit that referenced this pull request Feb 12, 2025
@dliappis @andsel @logstashmachine
Don't honor VERSION_QUALIFIER if set but empty (#17032)
fbd7baa 
PR #17006 revealed that the `VERSION_QUALIFIER` env var gets honored in
various scripts when present but empty.
This shouldn't be the case as the DRA process is designed to gracefully
ignore empty values for this variable.

This commit changes various ruby scripts to not treat "" as truthy.
Bash scripts (used by CI etc.) are already ok with this as part of
refactorings done in #16907.

---------

Co-authored-by: Andrea Selva <[email protected]>
(cherry picked from commit c7204fd)
dliappis added a commit that referenced this pull request Feb 12, 2025
@github-actions @dliappis
Don't honor VERSION_QUALIFIER if set but empty (#17032) (#17071)
ce8d43f 
PR #17006 revealed that the `VERSION_QUALIFIER` env var gets honored in
various scripts when present but empty.
This shouldn't be the case as the DRA process is designed to gracefully
ignore empty values for this variable.

This commit changes various ruby scripts to not treat "" as truthy.
Bash scripts (used by CI etc.) are already ok with this as part of
refactorings done in #16907.

---------

Co-authored-by: Andrea Selva <[email protected]>
(cherry picked from commit c7204fd)

Co-authored-by: Dimitrios Liappis <[email protected]>
dliappis added a commit that referenced this pull request Feb 12, 2025
@github-actions @dliappis
Don't honor VERSION_QUALIFIER if set but empty (#17032) (#17069)
283afd0 
PR #17006 revealed that the `VERSION_QUALIFIER` env var gets honored in
various scripts when present but empty.
This shouldn't be the case as the DRA process is designed to gracefully
ignore empty values for this variable.

This commit changes various ruby scripts to not treat "" as truthy.
Bash scripts (used by CI etc.) are already ok with this as part of
refactorings done in #16907.

---------

Co-authored-by: Andrea Selva <[email protected]>
(cherry picked from commit c7204fd)

Co-authored-by: Dimitrios Liappis <[email protected]>
dliappis added a commit that referenced this pull request Feb 12, 2025
@github-actions @dliappis
Don't honor VERSION_QUALIFIER if set but empty (#17032) (#17068)
92c37da 
PR #17006 revealed that the `VERSION_QUALIFIER` env var gets honored in
various scripts when present but empty.
This shouldn't be the case as the DRA process is designed to gracefully
ignore empty values for this variable.

This commit changes various ruby scripts to not treat "" as truthy.
Bash scripts (used by CI etc.) are already ok with this as part of
refactorings done in #16907.

---------

Co-authored-by: Andrea Selva <[email protected]>
(cherry picked from commit c7204fd)

Co-authored-by: Dimitrios Liappis <[email protected]>
dliappis added a commit that referenced this pull request Feb 12, 2025
@github-actions @dliappis
Don't honor VERSION_QUALIFIER if set but empty (#17032) (#17070)
3e041cd 
PR #17006 revealed that the `VERSION_QUALIFIER` env var gets honored in
various scripts when present but empty.
This shouldn't be the case as the DRA process is designed to gracefully
ignore empty values for this variable.

This commit changes various ruby scripts to not treat "" as truthy.
Bash scripts (used by CI etc.) are already ok with this as part of
refactorings done in #16907.

---------

Co-authored-by: Andrea Selva <[email protected]>
(cherry picked from commit c7204fd)

Co-authored-by: Dimitrios Liappis <[email protected]>
v1v pushed a commit to v1v/logstash that referenced this pull request Feb 25, 2025
@dliappis @andsel @v1v
Don't honor VERSION_QUALIFIER if set but empty (elastic#17032)
b9a77cb 
PR elastic#17006 revealed that the `VERSION_QUALIFIER` env var gets honored in
various scripts when present but empty.
This shouldn't be the case as the DRA process is designed to gracefully
ignore empty values for this variable.

This commit changes various ruby scripts to not treat "" as truthy.
Bash scripts (used by CI etc.) are already ok with this as part of
refactorings done in elastic#16907.

---------

Co-authored-by: Andrea Selva <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jsvd jsvd jsvd approved these changes

@andsel andsel Awaiting requested review from andsel

@mashhurs mashhurs Awaiting requested review from mashhurs

Assignees

No one assigned

Labels

ci

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dliappis @elasticmachine @jsvd