Skip to content
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

Allow use of version qualifier for staging artifacts #42304

Merged
merged 10 commits into from
Jan 16, 2025
Merged

Allow use of version qualifier for staging artifacts #42304

merged 10 commits into from
Jan 16, 2025

Conversation

dliappis
Copy link
Contributor

@dliappis dliappis commented Jan 14, 2025 •
edited
Loading

Proposed commit message

This commits adds support for an optional $VERSION_QUALIFIER env var/build option in the packaging pipeline to allow building prerelease artifacts from staging.

How to test this PR locally

Tested a staging build using this PR with VERSION_QUALIFIER="alpha1" (also passed DRA_BRANCH="main" as this PR is based on main and we'd normally have tested alpha1 on main until 9.0 is cut): https://buildkite.com/elastic/beats-packaging-pipeline/builds/2138#01946b34-0e11-40b0-9610-cc647d2bea1e

Also tested a snapshot build (using DRA_BRANCH="main" and RUN_SNAPSHOT="true") to ensure that an empty --qualifier option works as advertised by the release manager: https://buildkite.com/elastic/beats-packaging-pipeline/builds/2143

Related issues

https://github.com/elastic/ingest-dev/issues/4857

@dliappis dliappis self-assigned this Jan 14, 2025
@dliappis dliappis requested a review from a team as a code owner January 14, 2025 13:59
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jan 14, 2025
@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 14, 2025

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @dliappis? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 14, 2025

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Jan 14, 2025
@dliappis
Allow use of version qualifier for staging artifacts
d57958e 
This commits adds support for an optional $VERSION_QUALIFIER env var
in the packaging pipeline to allow building prerelease artifacts.

Relates elastic/ingest-dev#4855
@dliappis dliappis force-pushed the package-version-qualifier branch from 33a3eb4 to d57958e Compare January 14, 2025 16:14
@dliappis
Copy link
Contributor Author

After a bit of back n forth this seems to work fine (https://buildkite.com/elastic/beats-packaging-pipeline/builds/2138#01946b34-0e11-40b0-9610-cc647d2bea1e)
The missing piece was appending the $VERSION_IDENTIFIER to the dependencies.csv file as discussed in https://elastic.slack.com/archives/C01DJ3DC0AX/p1736952200875849

rowlandgeoff
rowlandgeoff approved these changes Jan 15, 2025
View reviewed changes
Copy link
Contributor

@rowlandgeoff rowlandgeoff left a comment

Choose a reason for hiding this comment

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

Still LGTM. Thanks for testing it thoroughly.

@dliappis dliappis merged commit c7b6ad8 into elastic:main Jan 16, 2025
147 checks passed
@dliappis dliappis added backport-7.17 Automated backport to the 7.17 branch with mergify backport-8.17 Automated backport with mergify labels Jan 16, 2025
mergify bot pushed a commit that referenced this pull request Jan 16, 2025
@dliappis @mergify
Allow use of version qualifier for staging artifacts (#42304)
d8d8472 
This commits adds support for an optional $VERSION_QUALIFIER env var/build option in the packaging pipeline to allow building prerelease artifacts from staging.

Closes https://github.com/elastic/ingest-dev/issues/4857

(cherry picked from commit c7b6ad8)
@mergify mergify bot mentioned this pull request Jan 16, 2025
Merged
mergify bot pushed a commit that referenced this pull request Jan 16, 2025
@dliappis @mergify
Allow use of version qualifier for staging artifacts (#42304)
a5e5eda 
This commits adds support for an optional $VERSION_QUALIFIER env var/build option in the packaging pipeline to allow building prerelease artifacts from staging.

Closes https://github.com/elastic/ingest-dev/issues/4857

(cherry picked from commit c7b6ad8)

# Conflicts:
#	.buildkite/packaging.pipeline.yml
mergify bot pushed a commit that referenced this pull request Jan 16, 2025
@dliappis @mergify
Allow use of version qualifier for staging artifacts (#42304)
6d72c72 
This commits adds support for an optional $VERSION_QUALIFIER env var/build option in the packaging pipeline to allow building prerelease artifacts from staging.

Closes https://github.com/elastic/ingest-dev/issues/4857

(cherry picked from commit c7b6ad8)
This was referenced Jan 16, 2025
Merged
Merged
@dliappis dliappis added the backport-8.16 Automated backport with mergify label Jan 16, 2025
mergify bot pushed a commit that referenced this pull request Jan 16, 2025
@dliappis @mergify
Allow use of version qualifier for staging artifacts (#42304)
2656d7e 
This commits adds support for an optional $VERSION_QUALIFIER env var/build option in the packaging pipeline to allow building prerelease artifacts from staging.

Closes https://github.com/elastic/ingest-dev/issues/4857

(cherry picked from commit c7b6ad8)
@mergify mergify bot mentioned this pull request Jan 16, 2025
Merged
dliappis added a commit that referenced this pull request Jan 16, 2025
@mergify @dliappis
Allow use of version qualifier for staging artifacts (#42304) (#42319)
b2d6738 
This commits adds support for an optional $VERSION_QUALIFIER env var/build option in the packaging pipeline to allow building prerelease artifacts from staging.

Closes https://github.com/elastic/ingest-dev/issues/4857

(cherry picked from commit c7b6ad8)

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
dliappis added a commit that referenced this pull request Jan 16, 2025
@mergify @dliappis
Allow use of version qualifier for staging artifacts (#42304) (#42321)
6bccca1 
This commits adds support for an optional $VERSION_QUALIFIER env var/build option in the packaging pipeline to allow building prerelease artifacts from staging.

Closes https://github.com/elastic/ingest-dev/issues/4857

(cherry picked from commit c7b6ad8)

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
dliappis added a commit that referenced this pull request Jan 16, 2025
@mergify @dliappis
Allow use of version qualifier for staging artifacts (#42304) (#42322)
fdd4bfd 
This commits adds support for an optional $VERSION_QUALIFIER env var/build option in the packaging pipeline to allow building prerelease artifacts from staging.

Closes https://github.com/elastic/ingest-dev/issues/4857

(cherry picked from commit c7b6ad8)

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
dliappis added a commit that referenced this pull request Jan 16, 2025
@mergify @dliappis
[7.17](backport #42304) Allow use of version qualifier for staging ar…
30a34a0 
…tifacts (#42320)

This commits adds support for an optional $VERSION_QUALIFIER env var/build option in the packaging pipeline to allow building prerelease artifacts from staging.

Closes https://github.com/elastic/ingest-dev/issues/4857

(cherry picked from commit c7b6ad8)

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
dliappis added a commit to dliappis/beats that referenced this pull request Jan 16, 2025
@dliappis
Don't run packaging snapshot with prereleases
3c93ba2 
This fixes a small bug related to elastic#42304 ; when we (manually)
trigger prerelease builds (by setting VERSION_QUALIFIER="...") we
only want them to trigger staging builds and skip snapshot builds.
@dliappis dliappis mentioned this pull request Jan 16, 2025
Merged
dliappis added a commit to dliappis/beats that referenced this pull request Jan 16, 2025
@dliappis
Don't run packaging snapshot with prereleases
4a97cd2 
This fixes a small bug related to elastic#42304 ; when we (manually)
trigger prerelease builds (by setting VERSION_QUALIFIER="...") we
only want them to trigger staging builds and skip snapshot builds.
dliappis added a commit that referenced this pull request Jan 17, 2025
@dliappis
Don't run packaging snapshot with prereleases (#42326)
a122a9f 
This fixes a small bug related to #42304 ; when we (manually)
trigger prerelease builds (by setting VERSION_QUALIFIER="...") we
only want them to trigger staging builds and skip snapshot builds.
mergify bot pushed a commit that referenced this pull request Jan 17, 2025
@dliappis @mergify
Don't run packaging snapshot with prereleases (#42326)
54d303c 
This fixes a small bug related to #42304 ; when we (manually)
trigger prerelease builds (by setting VERSION_QUALIFIER="...") we
only want them to trigger staging builds and skip snapshot builds.

(cherry picked from commit a122a9f)

# Conflicts:
#	.buildkite/packaging.pipeline.yml
@mergify mergify bot mentioned this pull request Jan 17, 2025
Merged
mergify bot pushed a commit that referenced this pull request Jan 17, 2025
@dliappis @mergify
Don't run packaging snapshot with prereleases (#42326)
ffc0aec 
This fixes a small bug related to #42304 ; when we (manually)
trigger prerelease builds (by setting VERSION_QUALIFIER="...") we
only want them to trigger staging builds and skip snapshot builds.

(cherry picked from commit a122a9f)
@mergify mergify bot mentioned this pull request Jan 17, 2025
Merged
mergify bot pushed a commit that referenced this pull request Jan 17, 2025
@dliappis @mergify
Don't run packaging snapshot with prereleases (#42326)
dc8936a 
This fixes a small bug related to #42304 ; when we (manually)
trigger prerelease builds (by setting VERSION_QUALIFIER="...") we
only want them to trigger staging builds and skip snapshot builds.

(cherry picked from commit a122a9f)
@mergify mergify bot mentioned this pull request Jan 17, 2025
Merged
mergify bot pushed a commit that referenced this pull request Jan 17, 2025
@dliappis @mergify
Don't run packaging snapshot with prereleases (#42326)
e682b4e 
This fixes a small bug related to #42304 ; when we (manually)
trigger prerelease builds (by setting VERSION_QUALIFIER="...") we
only want them to trigger staging builds and skip snapshot builds.

(cherry picked from commit a122a9f)
@mergify mergify bot mentioned this pull request Jan 17, 2025
Merged
jlind23 pushed a commit that referenced this pull request Jan 17, 2025
@mergify @dliappis
[7.17](backport #42326) Don't run packaging snapshot with prereleases (…
956f44e 
…#42330)

* Don't run packaging snapshot with prereleases (#42326)

This fixes a small bug related to #42304 ; when we (manually)
trigger prerelease builds (by setting VERSION_QUALIFIER="...") we
only want them to trigger staging builds and skip snapshot builds.

(cherry picked from commit a122a9f)

# Conflicts:
#	.buildkite/packaging.pipeline.yml

* fix merge conflicts

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
dliappis added a commit that referenced this pull request Jan 17, 2025
@mergify @dliappis
Don't run packaging snapshot with prereleases (#42326) (#42332)
58f7c8c 
This fixes a small bug related to #42304 ; when we (manually)
trigger prerelease builds (by setting VERSION_QUALIFIER="...") we
only want them to trigger staging builds and skip snapshot builds.

(cherry picked from commit a122a9f)

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
dliappis added a commit that referenced this pull request Jan 17, 2025
@mergify @dliappis
Don't run packaging snapshot with prereleases (#42326) (#42333)
27de6d3 
This fixes a small bug related to #42304 ; when we (manually)
trigger prerelease builds (by setting VERSION_QUALIFIER="...") we
only want them to trigger staging builds and skip snapshot builds.

(cherry picked from commit a122a9f)

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
dliappis added a commit that referenced this pull request Jan 17, 2025
@mergify @dliappis
Don't run packaging snapshot with prereleases (#42326) (#42331)
6237448 
This fixes a small bug related to #42304 ; when we (manually)
trigger prerelease builds (by setting VERSION_QUALIFIER="...") we
only want them to trigger staging builds and skip snapshot builds.

(cherry picked from commit a122a9f)

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexsapran alexsapran alexsapran left review comments

@rowlandgeoff rowlandgeoff rowlandgeoff approved these changes

Assignees

@dliappis dliappis

Labels
backport-7.17 Automated backport to the 7.17 branch with mergify backport-8.x Automated backport to the 8.x branch with mergify backport-8.16 Automated backport with mergify backport-8.17 Automated backport with mergify ci Team:Ingest-EngProd
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dliappis @alexsapran @rowlandgeoff