Skip to content

gh: e2e-upgrade: test patch releases#43627

Merged
julianwiedmann merged 4 commits intomainfrom
pr/jwi/main/gh-patch-upgrade
Jan 20, 2026
Merged

gh: e2e-upgrade: test patch releases#43627
julianwiedmann merged 4 commits intomainfrom
pr/jwi/main/gh-patch-upgrade

Conversation

@julianwiedmann
Copy link
Copy Markdown
Member

@julianwiedmann julianwiedmann commented Jan 8, 2026

So far we've been doing upgrade testing for

  • the previous {minor, patch} release, for e2e configs with IPsec. The patch-level testing only happens in stable branches, using the ipsec-upgrade workflow.
  • the previous minor release, for all other e2e configs.

Add the needed bits for patch-level testing to e2e-upgrade, and enable it for all e2e configs. Then remove the ipsec-upgrade workflow.

Patch-level testing happened in #43751, and will subsequently land in v1.19 through that PR.

Fixes: #31932

@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jan 8, 2026
@julianwiedmann julianwiedmann changed the title Pr/jwi/main/gh patch upgrade gh: e2e-upgrade: test patch releases Jan 8, 2026
@julianwiedmann julianwiedmann added the release-note/ci This PR makes changes to the CI. label Jan 8, 2026
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jan 8, 2026
@julianwiedmann julianwiedmann added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jan 8, 2026
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jan 8, 2026
@julianwiedmann julianwiedmann added upgrade-impact This PR has potential upgrade or downgrade impact. needs-backport/1.19 This PR / issue needs backporting to the v1.19 branch labels Jan 8, 2026
@julianwiedmann
Copy link
Copy Markdown
Member Author

@aanm if you have a moment, wanna give this a quick look to see if there's any surprises here? The first two patches mostly.

Copy link
Copy Markdown
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

@julianwiedmann first two commits LGTM

Copy link
Copy Markdown
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

Ah, looking at the remaining 3 patches. This patched looked familiar. I didn't double check but I believe the tests-e2e-upgrade is missing the ipsec key rotation? See the changes in https://github.com/cilium/cilium/pull/40437/changes

Copy link
Copy Markdown
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

oh, this is the tests-ipsec-upgrade.yaml, not the conformance-ipsec-e2e.yaml. Then it should be good then.

@julianwiedmann julianwiedmann force-pushed the pr/jwi/main/gh-patch-upgrade branch from a806f07 to 2c945cb Compare January 9, 2026 07:36
@julianwiedmann julianwiedmann force-pushed the pr/jwi/main/gh-patch-upgrade branch from 2c945cb to d9fe89b Compare January 19, 2026 13:21
@julianwiedmann julianwiedmann added the backport/author The backport will be carried out by the author of the PR. label Jan 19, 2026
@julianwiedmann
Copy link
Copy Markdown
Member Author

/test

@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 Jan 19, 2026
@julianwiedmann julianwiedmann force-pushed the pr/jwi/main/gh-patch-upgrade branch from d9fe89b to bbe2442 Compare January 19, 2026 17:08
@julianwiedmann julianwiedmann removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jan 19, 2026
@julianwiedmann
Copy link
Copy Markdown
Member Author

/test

@julianwiedmann
Copy link
Copy Markdown
Member Author

The branch has a temporary commit to allow for testing of the workflows. I'll drop it before merging.

@julianwiedmann julianwiedmann marked this pull request as ready for review January 19, 2026 17:12
@julianwiedmann julianwiedmann requested review from a team as code owners January 19, 2026 17:12
@julianwiedmann julianwiedmann added the dont-merge/blocked Another PR must be merged before this one. label Jan 19, 2026
Customize the downgrade version and image tag as needed. And skip most of
the workflow when no downgrade version is available (since we don't test
patch releases on the main branch).

Note that this doesn't introduce additional testing, since we still only
generate matrix entries with 'minor' mode.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
… tests

`skip-upgrade` is meant for situations where the `old` release doesn't
support a certain config setting, and thus we should only test the PR
branch.

Assume that this doesn't apply for patch release testing.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Start generating matrix entries with 'patch' mode.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
This has now been fully integrated into the e2e-upgrade workflow.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann julianwiedmann force-pushed the pr/jwi/main/gh-patch-upgrade branch from bbe2442 to 79cc2c7 Compare January 19, 2026 17:59
@julianwiedmann
Copy link
Copy Markdown
Member Author

/test

Copy link
Copy Markdown
Contributor

@smagnani96 smagnani96 left a comment

Choose a reason for hiding this comment

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

LGTM, left some thoughts mostly for myself to understand better.

@julianwiedmann julianwiedmann force-pushed the pr/jwi/main/gh-patch-upgrade branch from 79cc2c7 to 97c76c7 Compare January 20, 2026 18:56
@julianwiedmann julianwiedmann removed the dont-merge/blocked Another PR must be merged before this one. label Jan 20, 2026
@julianwiedmann
Copy link
Copy Markdown
Member Author

/test

@julianwiedmann julianwiedmann added this pull request to the merge queue Jan 20, 2026
Merged via the queue into main with commit 0b8f52d Jan 20, 2026
394 of 395 checks passed
@julianwiedmann julianwiedmann deleted the pr/jwi/main/gh-patch-upgrade branch January 20, 2026 20:03
@julianwiedmann julianwiedmann added backport-pending/1.19 The backport for Cilium 1.19.x for this PR is in progress. and removed needs-backport/1.19 This PR / issue needs backporting to the v1.19 branch labels Jan 20, 2026
@github-actions github-actions bot added backport-done/1.19 The backport for Cilium 1.19.x for this PR is done. and removed backport-pending/1.19 The backport for Cilium 1.19.x for this PR is in progress. labels Jan 21, 2026
@cilium-release-bot cilium-release-bot bot moved this to Released in cilium v1.19.0 Feb 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/author The backport will be carried out by the author of the PR. backport-done/1.19 The backport for Cilium 1.19.x for this PR is done. release-note/ci This PR makes changes to the CI. upgrade-impact This PR has potential upgrade or downgrade impact.

Projects

No open projects
Status: Released

Development

Successfully merging this pull request may close these issues.

ci-e2e-upgrade: Add minor / patch upgrades

4 participants