Skip to content

Fix some test-e2e-upgrade issues#45075

Merged
aanm merged 3 commits intomainfrom
pr/fix-e2e-test-upgrade
Mar 31, 2026
Merged

Fix some test-e2e-upgrade issues#45075
aanm merged 3 commits intomainfrom
pr/fix-e2e-test-upgrade

Conversation

@aanm
Copy link
Copy Markdown
Member

@aanm aanm commented Mar 31, 2026

Read per commit basis if you are interested

a test run with these changes can be seen in https://github.com/cilium/cilium/actions/runs/23803670145

@aanm aanm added the release-note/ci This PR makes changes to the CI. label Mar 31, 2026
@aanm
Copy link
Copy Markdown
Member Author

aanm commented Mar 31, 2026

/test

1 similar comment
@cilium-ariane
Copy link
Copy Markdown

cilium-ariane bot commented Mar 31, 2026

/test

@aanm aanm force-pushed the pr/fix-e2e-test-upgrade branch from 9d4d6ce to 0c4f8d9 Compare March 31, 2026 13:08
@aanm
Copy link
Copy Markdown
Member Author

aanm commented Mar 31, 2026

/ci-l3-l4

1 similar comment
@cilium-ariane
Copy link
Copy Markdown

cilium-ariane bot commented Mar 31, 2026

/ci-l3-l4

@aanm aanm force-pushed the pr/fix-e2e-test-upgrade branch from 0c4f8d9 to 17fb225 Compare March 31, 2026 14:09
@aanm
Copy link
Copy Markdown
Member Author

aanm commented Mar 31, 2026

/ci-l3-l4

aanm added 3 commits March 31, 2026 16:34
The VM should not take more than 10 minutes to be provisioned.

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: André Martins <andre@cilium.io>
On the main branch, VERSION ends with "-dev" and there is no preceding
patch release to downgrade to. Previously, "mode: patch" matrix entries
were still generated, causing runners to be provisioned only to skip all
steps when print-downgrade-version.sh returned empty.
Detect development versions in the generate-matrix step and set MODES to
only include "minor", avoiding the creation of patch entries altogether.
On stable branches, both "minor" and "patch" entries continue to be
generated as before.

Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm force-pushed the pr/fix-e2e-test-upgrade branch from 17fb225 to ee680ca Compare March 31, 2026 14:34
@aanm
Copy link
Copy Markdown
Member Author

aanm commented Mar 31, 2026

/ci-l3-l4

1 similar comment
@cilium-ariane
Copy link
Copy Markdown

cilium-ariane bot commented Mar 31, 2026

/ci-l3-l4

@aanm aanm force-pushed the pr/fix-e2e-test-upgrade branch from ee680ca to 9832890 Compare March 31, 2026 14:52
@aanm
Copy link
Copy Markdown
Member Author

aanm commented Mar 31, 2026

/test

@aanm aanm marked this pull request as ready for review March 31, 2026 14:52
@aanm aanm requested review from a team as code owners March 31, 2026 14:52
@aanm aanm requested review from Artyop, brlbil, julianwiedmann and smagnani96 and removed request for brlbil March 31, 2026 14:52
@aanm aanm enabled auto-merge March 31, 2026 14:53
@cilium-ariane
Copy link
Copy Markdown

cilium-ariane bot commented Mar 31, 2026

/test

@cilium-ariane
Copy link
Copy Markdown

cilium-ariane bot commented Mar 31, 2026

/ci-l3-l4

@aanm aanm added this pull request to the merge queue Mar 31, 2026
@smagnani96
Copy link
Copy Markdown
Contributor

Should this be backported to v1.19?

Merged via the queue into main with commit f6bd347 Mar 31, 2026
93 checks passed
@aanm aanm deleted the pr/fix-e2e-test-upgrade branch March 31, 2026 15:33
@aanm aanm added the needs-backport/1.19 This PR / issue needs backporting to the v1.19 branch label Apr 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-backport/1.19 This PR / issue needs backporting to the v1.19 branch release-note/ci This PR makes changes to the CI.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants