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.

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

release image: Allow arbitrary pre-release identifiers #33718

Merged
merged 1 commit into from
Jul 10, 2024

Conversation

michi-covalent
Copy link
Contributor

@michi-covalent michi-covalent commented Jul 10, 2024

Make the filter patterns for release image tags more lenient to allow arbitrary pre-release identifiers beyond rc. We made a similar change in main branch 1, but the change got lost when we branched v1.16.

Fixes: f5bdf28 ("Prepare v1.16 stable branch")

Footnotes

  1. https://github.com/cilium/cilium/pull/29173

@michi-covalent michi-covalent added the release-note/ci This PR makes changes to the CI. label Jul 10, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.16 This PR represents a backport for Cilium 1.16.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Jul 10, 2024
@michi-covalent
Copy link
Contributor Author

backporting #29173 to v1.16 branch so that this change gets forward ported when we create new stable branches.

@michi-covalent
Copy link
Contributor Author

/test-backport-1.16

@michi-covalent michi-covalent marked this pull request as ready for review July 10, 2024 21:06
@michi-covalent michi-covalent requested review from a team as code owners July 10, 2024 21:06
@michi-covalent michi-covalent enabled auto-merge July 10, 2024 21:06
@joestringer
Copy link
Member

joestringer commented Jul 10, 2024

[ upstream commit 9b3ab90 ]

Is this accurate? GitHub reports that the linked commit is already in v1.16 branch releases.

EDIT: Oh well yeah probably that commit is in the branch but we broke this when branching off, because we were copying directly from the v1.15 versions of the workflows cc @aanm . If we apply this patch as-is then the existing process should make sure we don't reintroduce this issue during the next v1.17 cycle.

Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

LGTM, but the commit reference is a bit misleading. Technically this is probably more of a case for:

Fixes: f5bdf28e8af1 ("Prepare v1.16 stable branch")

@michi-covalent michi-covalent added this pull request to the merge queue Jul 10, 2024
@michi-covalent michi-covalent removed this pull request from the merge queue due to a manual request Jul 10, 2024
Make the filter patterns for release image tags more lenient to allow
arbitrary pre-release identifiers beyond rc. We made a similar change
in main branch [^1], but the change got lost when we branched v1.16.

Fixes: f5bdf28 ("Prepare v1.16 stable branch")

[^1]: #29173

Signed-off-by: Michi Mutsuzaki <[email protected]>
@michi-covalent
Copy link
Contributor Author

LGTM, but the commit reference is a bit misleading.

updated the commit message 🚀

@michi-covalent
Copy link
Contributor Author

/test-backport-1.16

@michi-covalent michi-covalent enabled auto-merge July 10, 2024 23:02
@michi-covalent michi-covalent added this pull request to the merge queue Jul 10, 2024
Merged via the queue into v1.16 with commit 483b9ad Jul 10, 2024
63 of 64 checks passed
@michi-covalent michi-covalent deleted the pr/michi/release-tag branch July 10, 2024 23:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.16 This PR represents a backport for Cilium 1.16.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. release-note/ci This PR makes changes to the CI.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants