Postponing the release branch creation / Temporary CI strategy

[Federico Fossemo]

Hey all,

Given the current CI situation, caused by a mix of flakiness and Code Freeze bottleneck, creating the release branch right now is counterproductive,
as we will just hit the same blockers during the cherry-pick phase.

Instead, we are going to proceed with the following steps to clear the backlog first:

1. Change the tide merge rule to: approved-vep + lgtm + approved. https://github.com/kubevirt/project-infra/pull/5194
2. Give the CI 1–2 days to process and merge the current queue.
3. Create the release branch once that is cleared.
4. Rollback the tide rule to standard settings.

I will update everyone once step 1 is in place and we start clearing the queue.

Best regards,

The Release Team

[Daniel Hiller]

Hey all,

just quick note that the change of 1. has just been applied. This was merged as we just noticed that also the bazel cache has been showing evictions once again so the latest batch didn't have a chance to get in anyways.

--
You received this message because you are subscribed to the Google Groups "kubevirt-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to kubevirt-dev...@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/kubevirt-dev/CAJxgHm4LJegHJ95%3D4Bk7UmCDHPrm%3DU9g%3D8uHB2c34C2RaDhwzA%40mail.gmail.com.

--

-- 

Best,

Daniel

[Daniel Hiller]

Hey again,

FYI: We've put all PRs that lack the `approved-vep` label but have LGTM+approval on hold.

This was done to prevent the retest bot from automatically retesting, prioritizing the merging of approved VEP PRs.

Example: https://github.com/kubevirt/kubevirt/pull/16975#issuecomment-4791626313

--

-- 

Best,

Daniel

[Daniel Hiller]

First batch was merged at ~21:30 this evening. 

#17544 (253a38b) by Aseeef #17886 (2c51e51) by fanzhangio #17998 (ddcd7cc) by fanzhangio #18001 (b34400e) by iholder101 #18032 (f1e2d20) by 0xFelix #18137 (62bb8b2) by Barakmor1 #18181 (efa3446) by awels #18188 (4dbbda7) by machadovilaca

2nd batch is running now.

#17770 (1107d4d) by jschintag
#18218 (e471471) by kubevirt-bot
#18220 (39d1616) by 0xFelix

--

-- 

Best,

Daniel

[Alexander Wels]

Btw this PR https://github.com/kubevirt/kubevirt/pull/18216 used to have an approved-vep label (it is part of getting decentralized live migration to beta). But somehow it lost that. I can't seem to understand why. But it has all the acks, and I would like it merged since it is blocking the actual PR from being merged.

To view this discussion visit https://groups.google.com/d/msgid/kubevirt-dev/CAK%2BeyL4gPkgw%3DPs0jNs%2BnbWEVqFaWTBtpsDqBmFubTT_ftPoCQ%40mail.gmail.com.

[Daniel Hiller]

Batch merged this morning:

#17770 (1107d4d) by jschintag #18220 (39d1616) by 0xFelix

--

-- 

Best,

Daniel

[Daniel Hiller]

Next batch running:

#17540 (9e58ac0) by orenc1 #18216 (365cf5e) by awels

--

-- 

Best,

Daniel

[Daniel Hiller]

Alex, your PR is part of the latest batch - it has the label

--

-- 

Best,

Daniel

[Itamar Holder]

Thank you Daniel and Federico. Much appreciated.

I just wanted to note that the merges caused some approved-vep PRs to "need-rebase".

VEP owners: Please resolve conflicts ASAP so we can merge all approved-vep PRs that received LGTM and approval BEFORE the freeze) merge.

In addition - approvers: please avoid approving PRs that are not relevant for the current release in the next 24 hours to let the dust settle.

Thanks for everyone involved!

To view this discussion visit https://groups.google.com/d/msgid/kubevirt-dev/CAK%2BeyL4UHkmXDpQYWvwsDxxcfy9XD9rs-pNH-7uLnkKLdJocNQ%40mail.gmail.com.

[Daniel Hiller]

I've seen that the approved-vep automation seems to have removed the label from Alex's PR here:

https://github.com/kubevirt/kubevirt/actions/runs/28123859150/job/83282496376?pr=18216#step:5:17

--

-- 

Best,

Daniel

[Federico Fossemo]

@Daniel Hiller It was due to a missing case in the github action.
Fix: https://github.com/kubevirt/kubevirt/pull/18244

Thanks

[Daniel Hiller]

Hey all,

we just merged the fix pr for the approved-vep label automation manually.

Please raise issues in this thread should you spot something!

Thanks!

--

-- 

Best,

Daniel