Skip to content

ci: fix merge group required checks #29337

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

Merged
merged 1 commit into from
Nov 22, 2023
Merged

Conversation

brlbil
Copy link
Contributor

@brlbil brlbil commented Nov 22, 2023

This PR removes merge_group trigger from tests-smoke-ipv6.yaml workflow and adds a condition for Installation and Conformance Test in tests-smoke.yaml not to run on merge_group events.

These two tests require CI images and since merge_group creates a new branch with all other commits merged in the queue, SHA of the expected image is changed. Either we have to add Build Image CI to the required checks or disable these tests from running. Since Build Image CI takes a long time to run, on top of these two tests have to wait for the image to be available and run to completion. We implemented the second option.

@maintainer-s-little-helper
Copy link

Commit 74f3fd3 does not match "(?m)^Signed-off-by:".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Nov 22, 2023
This commit removes merge_group trigger from tests-smoke-ipv6.yaml workflow
and adds a condition for Installation and Conformance Test in tests-smoke.yaml
not to run on merge_group events.
These two tests require CI images and since merge_group creates a new branch with
all other commits merged in the queue, SHA of the expected image is changed.
Either we have to add Build Image CI to the required checks or disable these
tests from running. Since Build Image CI takes a long time to run, on top of
these two tests have to wait for the image to be available and run to completion.
We implemented the second option.

Signed-off-by: Birol Bilgin <birol@cilium.io>
@brlbil brlbil force-pushed the pr/brlbil/ci-fix-mergeq-checks branch from 74f3fd3 to 64ac1bd Compare November 22, 2023 17:34
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Nov 22, 2023
@brlbil brlbil added area/CI-improvement Topic or proposal to improve the Continuous Integration workflow release-note/ci This PR makes changes to the CI. labels Nov 22, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Nov 22, 2023
@brlbil
Copy link
Contributor Author

brlbil commented Nov 22, 2023

/test

@brlbil brlbil marked this pull request as ready for review November 22, 2023 17:39
@brlbil brlbil requested review from a team as code owners November 22, 2023 17:39
@brlbil brlbil requested a review from nbusseneau November 22, 2023 17:39
@brlbil
Copy link
Contributor Author

brlbil commented Nov 22, 2023

Failing tests are not related to the changes so setting as read to merge

@brlbil brlbil added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Nov 22, 2023
@aanm aanm merged commit 01ebdc7 into main Nov 22, 2023
@aanm aanm deleted the pr/brlbil/ci-fix-mergeq-checks branch November 22, 2023 20:09
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 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
None yet
Development

Successfully merging this pull request may close these issues.

3 participants