Skip to content

Conversation

qmonnet
Copy link
Member

@qmonnet qmonnet commented Oct 26, 2023

  • contrib/scripts: Support patch releases in print-downgrade-version.sh
  • ci/ipsec: Add upgrade/downgrade tests for patch releases
  • ci/ipsec: Skip upgrade/downgrade test to patch release on main branch

Related to

Corresponding backport PRs:

@qmonnet qmonnet added area/CI-improvement Topic or proposal to improve the Continuous Integration workflow area/encryption Impacts encryption support such as IPSec, WireGuard, or kTLS. release-note/ci This PR makes changes to the CI. labels Oct 26, 2023
@qmonnet qmonnet force-pushed the pr/qmonnet/ipsec-patch-release-update branch 2 times, most recently from ffb9ea2 to df4533d Compare October 30, 2023 16:03
@qmonnet qmonnet force-pushed the pr/qmonnet/ipsec-patch-release-update branch from df4533d to 93bf6e4 Compare November 9, 2023 13:49
@qmonnet qmonnet added backport-pending/1.12 backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. backport/author The backport will be carried out by the author of the PR. labels Nov 9, 2023
@brb
Copy link
Member

brb commented Nov 11, 2023

/test

@brb
Copy link
Member

brb commented Nov 13, 2023

/ci-ipsec-upgrade

@qmonnet qmonnet force-pushed the pr/qmonnet/ipsec-patch-release-update branch 2 times, most recently from f45234b to d933888 Compare November 20, 2023 13:17
@qmonnet
Copy link
Member Author

qmonnet commented Nov 20, 2023

/test

@qmonnet qmonnet requested a review from brb November 20, 2023 13:20
@qmonnet qmonnet marked this pull request as ready for review November 20, 2023 13:20
@qmonnet qmonnet requested review from a team as code owners November 20, 2023 13:20
@pchaigno pchaigno self-requested a review November 20, 2023 22:29
Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

Nice commit history and description! ❤️

@aditighag aditighag removed their request for review November 21, 2023 19:18
@qmonnet qmonnet force-pushed the pr/qmonnet/ipsec-patch-release-update branch from d933888 to 91a2888 Compare November 22, 2023 09:56
@qmonnet
Copy link
Member Author

qmonnet commented Nov 22, 2023

Since the previous version, I simply fixed the mistake reported by Paul.
/test

Skip upgrade/downgrade test to patch release when we fail to retrieve
the number for the previous patch release. This happens mostly for the
main branch (where testing upgrades/downgrades is covered by the tests
to the previous stable (minor) release already). This may also happen on
top of release preparation commits, where we set the patch number to 90,
and where it is non-trivial to retrieve the previous patch release
number. This case doesn't matter much, because commits for preparing
releases are Not Expected To Break IPsec (TM).

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
@qmonnet qmonnet force-pushed the pr/qmonnet/ipsec-patch-release-update branch from 91a2888 to 40cf054 Compare November 22, 2023 15:01
@qmonnet qmonnet requested a review from a team as a code owner November 22, 2023 15:01
@qmonnet
Copy link
Member Author

qmonnet commented Nov 22, 2023

@julianwiedmann Good thing you asked, this commit description is wrong indeed. I wrote it the other way initially, but apparently I got confused at some point and changed to the actual, mistaken description - then forgot to check it a final time before pushing 🤔. Anyway, I just fixed it.

@qmonnet
Copy link
Member Author

qmonnet commented Nov 22, 2023

/test

Copy link
Member

@julianwiedmann julianwiedmann left a comment

Choose a reason for hiding this comment

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

@julianwiedmann Good thing you asked, this commit description is wrong indeed. I wrote it the other way initially, but apparently I got confused at some point and changed to the actual, mistaken description - then forgot to check it a final time before pushing 🤔. Anyway, I just fixed it.

Thank you!

@julianwiedmann julianwiedmann removed the dont-merge/discussion A discussion is ongoing and should be resolved before merging, regardless of reviews & tests status. label Nov 22, 2023
Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

Re-approving to catch the new cilium/ipsec review request.

@qmonnet qmonnet added this pull request to the merge queue Nov 22, 2023
Merged via the queue into main with commit c9dedb4 Nov 22, 2023
@qmonnet qmonnet deleted the pr/qmonnet/ipsec-patch-release-update branch November 22, 2023 17:07
@maintainer-s-little-helper maintainer-s-little-helper bot added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Nov 22, 2023
@github-actions github-actions bot added backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.12 backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Nov 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/CI-improvement Topic or proposal to improve the Continuous Integration workflow area/encryption Impacts encryption support such as IPSec, WireGuard, or kTLS. backport/author The backport will be carried out by the author of the PR. backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/ci This PR makes changes to the CI.
Projects
No open projects
Status: Released
Status: Released
Status: Released
Development

Successfully merging this pull request may close these issues.

5 participants