phased: Enable run_before_merge for phase 2 jobs

[oshoval]

Seems tide has a bug, it doesnt run the phase 2 for batches.
A simple wa until it is fixed is to use run_before_merge, which force a batch to run it.

Real fix is to consider manually triggered jobs as well on this line at presubmitsForBatch
shouldRun, err := ps.ShouldRun(baseBranch, c.changedFiles.batchChanges(prs), ps.RunBeforeMerge, false)
The required logic exists on kubernetes/test-infra#30191

presubmitsByPull should be fixed as well iiuc.

{"base-branch":"main","base-sha":"b171859a412395ef5c4974a037e45aed13bd0dfc","component":"tide","context":"pull-kubevirt-e2e-k8s-1.27-ipv6-sig-network","controller":"sync","file":"k8s.io/test-infra/prow/tide/tide.go:1631","func":"k8s.io/test-infra/prow/tide.(*syncController).presubmitsForBatch","level":"debug","msg":"Presubmit excluded by ps.ShouldRun","org":"kubevirt","repo":"kubevirt","severity":"debug","time":"2024-01-17T12:43:59Z"}

[oshoval]

Nice find @brianmcarey
wdyt?

[brianmcarey]

This looks like what we were looking for.

        // RunBeforeMerge indicates that a job should always run by Tide as long as
        // Brancher matches.
        // This is used when a prowjob is so expensive that it's not ideal to run on
        // every single push from all PRs.
        RunBeforeMerge bool `json:"run_before_merge,omitempty"`

https://github.com/kubernetes/test-infra/blob/c758e68cdeb67314148a6be992957d092d63fcaa/prow/config/jobs.go#L203C1-L205C57

The phased plugin will still be useful I think though as it will not have to wait for "phase 1" jobs to complete before triggering the "phase 2" jobs.

/approve

[kubevirt-bot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: brianmcarey

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• github/ci/prow-deploy/files/jobs/kubevirt/kubevirt/OWNERS [brianmcarey]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[kubevirt-bot]

@oshoval: Updated the job-config configmap in namespace kubevirt-prow at cluster default using the following files:

• key kubevirt-presubmits.yaml using file github/ci/prow-deploy/files/jobs/kubevirt/kubevirt/kubevirt-presubmits.yaml

In response to this:

Seems tide has a bug, it doesnt run the phase 2 for batches.
A simple wa until it is fixed is to use run_before_merge, which force a batch to run it.

Real fix is to consider manually triggered jobs as well on this line at presubmitsForBatch
shouldRun, err := ps.ShouldRun(baseBranch, c.changedFiles.batchChanges(prs), ps.RunBeforeMerge, false)
The required logic exists on kubernetes/test-infra#30191

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[oshoval]

Trying here to fix tide, WIP
kubernetes/test-infra#31687

once it is merged (hopefully), we can remove the WA
btw iiuc, without the WA we also suffer from kubernetes/test-infra#31050
means means tide doesn't even wait / trigger according needs phase 2 jobs.