ci/ipsec: Fix version retrieval for downgrades to closest patch release #30503
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit brings two fixes to the script that we use to determine to
which version we should upgrade/downgrade in some CI workflows.
The first fix is the most important one. When looking for the closest
patch version, make the script return the value in VERSION instead of
decrementing it. The rationale is that for stable branches, VERSION
already points to the latest patch release, there is no need to decrease
it further! This fix does not affect the output for the calculation of
the previous minor version number.
The second fix is simply the addition of an error message in case the
minor version number is 0, to get some explicit error instead of a
silent failure if we ever reach Cilium 2.0.0.
Updated samples of numbers from VERSION and the corresponding values
returned:
VERSION Previous minor Previous patch release
1.14.3 v1.13 v1.14.3
1.14.1 v1.13 v1.14.1
1.14.0 v1.13 <error>
1.14.1-dev v1.13 v1.14.1
1.15.0-dev v1.14 <error>
1.13.90 v1.12 <error>
2.0.1 <error> v2.0.1
Fixes: 56dfec2 ("contrib/scripts: Support patch releases in print-downgrade-version.sh")
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
qmonnet
added
kind/bug/CI
|
/ci-ipsec-upgrade |
bimmlerd
approved these changes
Jan 29, 2024
|
cc @cilium/sig-clustermesh , as |
|
/test |
Thanks for the ping! The clustermesh workflow is not strictly affected because it only tests downgrades to the previous minor version, not to the patch one. |
julianwiedmann
deleted the
pr/qmonnet/ipsec/ci-upgrade-patch-version-fix
branch
joamaki
added
backport-pending/1.13
joamaki
added
the
backport-pending/1.15
github-actions
bot
added
backport-done/1.13
maintainer-s-little-helper
bot
moved this from Backport pending to v1.13
to Backport done to v1.13
in 1.13.12
joamaki
added
backport-pending/1.14
maintainer-s-little-helper
bot
moved this from Needs backport from main
to Backport pending to v1.14
in 1.14.7
aanm
added
backport-done/1.15
github-actions
bot
added
backport-done/1.14
maintainer-s-little-helper
bot
moved this from Needs backport from main
to Backport pending to v1.12
in 1.12.19
github-actions
bot
added
backport-done/1.12
maintainer-s-little-helper
bot
moved this from Backport pending to v1.12
to Backport done to v1.12
in 1.12.19
This was referenced Feb 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Julian reports that the IPsec upgrade/downgrade workflow still has a flake that we expected to be gone, now that the fix is released patch version 1.13.11. As it turns out, the workflow does not pick and downgrade to the latest patch release, but to the one before that, because the script would decrement the value found in file
VERSION. We don't need this,VERSIONalready contains the last patch release that was published, not the one to come.Fixes: 56dfec2 ("contrib/scripts: Support patch releases in print-downgrade-version.sh")
Fixes: #28815
Cc @pchaigno just FYI