release-tool: Update phase 2 jobs to be considered phase 1 when forking a new branch #3126

oshoval · 2023-12-13T12:34:56Z

During new release branch creation, we should convert phase 2 jobs
to be considered phase 1, by setting always_run=true,
because phased plugin is used only for main branch.

Note: we might want to consider #3184 (by removing run_before_merge as well)
but since the jobs become phase 1 it shouldn't affect even if the field remains.

kubevirt-bot · 2023-12-13T12:34:59Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

kubevirt-bot · 2023-12-13T12:35:00Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign phoracek for approval. For more information see the Kubernetes Code Review Process.

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

Needs approval from an approver in each of these files:

OWNERS

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

oshoval · 2023-12-14T11:58:54Z

releng/release-tool/release-tool.go

+		return "", fmt.Errorf("Error marshalling yaml: %v", err)
+	}
+
+	updateJobConfig := os.TempDir() + "/job-config.yaml"


should we use rand name ? just if we need to allow reentrancy

…ng a new branch Signed-off-by: Or Shoval <oshoval@redhat.com>

oshoval · 2024-01-15T11:18:29Z

/cc @brianmcarey @dhiller
needed once we start working with phased plugin

dhiller · 2024-03-05T16:12:48Z

releng/release-tool/release-tool.go

@@ -1271,3 +1277,70 @@ func main() {
 		}
 	}
 }
+
+func updatePhase2Jobs(orgRepo, fullJobConfig string) (string, error) {
+	fileContent, err := ioutil.ReadFile(fullJobConfig)


What is the reason why you don't use config.ReadJobConfig from kubernetes/test-infra? I think that could simplify the code, i.e. making unnecessary all the type conversion?

Usage example:

project-infra/robots/pkg/kubevirt/cmd/require/presubmits.go

Line 96 in a940953

jobConfig, err := config.ReadJobConfig(requirePresubmitsOpts.jobConfigPathKubevirtPresubmits)

i think that when i tried something alike it reordered the fields and did a mass
i can try to make sure with this function

EDIT - here we can see the previous try, i will check if that function uses the one you suggested
(or just try with yours)
https://github.com/kubevirt/project-infra/compare/c42e6a20402114f19a49a528539ff35c1359e6b8..ac8a5d6a7e206ff8c35ce4e03c7b0cf4a75e8980#diff-585313f6146df52ade10307f2f7bd15a57cddd496439c6cc2d8c1cdd30eb7562L1290

Yeah, that's the func I meant. I don't know if it matters much that it reorders the fields, since this is from perspective of the forked jobs, which aren't yet committed anyway, no?

Don't remember how i tested it exactly,
when i test it now it totally mess the file (did some tricks there to tests it quick and dirty)
IIRC, at the past it was either messing it or added tons of nil fields and this was the reason i dropped it
The current solution is the cleanest i found tbh in matter of the output and also the code is pretty straight forward and has unit tests.

kubevirt-bot · 2024-03-08T12:13:25Z

@oshoval: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-prow-kubevirt-labels-update-precheck	`45b45d6`	link	true	`/test pull-prow-kubevirt-labels-update-precheck`
pull-prow-nmstate-labels-update-precheck	`45b45d6`	link	true	`/test pull-prow-nmstate-labels-update-precheck`

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-sigs/prow repository. I understand the commands that are listed here.

oshoval · 2024-04-07T10:25:23Z

@brianmcarey @dhiller
Wdyt about the following idea:
Close this PR and even without phased plugin supporting branches, it will still work and just run the phase 2
by tide due to "run_before_merge".
It is totally safe as long as we use "run_before_merge" flag.
If in the future we fix phased plugin such that this flag can be removed, then we will need to revisit this PR or some other solutions (like supporting phased plugin for branches etc)
Alternative is to continue working on the PR / take as it.

Note: since we don't use atm FromBranchProtection, the lanes basically are not considered required for entering the merge queue, but they are considered required for Tide when it creates batch / merge candids due to "run_before_merge".
This why it won't block the PR to enter the merge queue, and on the other hand would run before merging.

oshoval · 2024-04-07T11:52:05Z

i am closing this PR, i think that everything will work atm out of the box, (no need to change nor the always run nor the run_before_merge)
please see previous comment explanation
if someone is against please let me know

Thanks

/close

kubevirt-bot · 2024-04-07T11:52:08Z

@oshoval: Closed this PR.

In response to this:

i am closing this PR, i think that everything will work atm out of the box, (no need to change nor the always run nor the run_before_merge)
please see previous comment explanation
if someone is against please let me know

Thanks

/close

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 · 2024-07-03T13:06:16Z

/reopen

kubevirt-bot · 2024-07-03T13:06:19Z

@oshoval: Reopened this PR.

In response to this:

/reopen

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-sigs/prow repository.

oshoval · 2024-07-03T13:10:43Z

reopened upon Brian request
It should solve new release creation
imo it is good as is, hope you will agree

brianmcarey · 2024-07-03T13:13:57Z

reopened upon Brian request It should solve new release creation imo it is good as is, hope you will agree

thanks @oshoval - this is an option for fixing - #3478

kubevirt-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Dec 13, 2023

kubevirt-bot requested a review from davidvossel December 13, 2023 12:34

kubevirt-bot requested a review from xpivarc December 13, 2023 12:35

kubevirt-bot added the size/M label Dec 13, 2023

oshoval mentioned this pull request Dec 13, 2023

plugins: Introduce phased plugin #3103

Merged

oshoval force-pushed the rtool branch from 195ecbe to c42e6a2 Compare December 13, 2023 12:38

oshoval changed the title ~~release-tool: Update phase 2 jobs to be consider phase 1 when forking a new branch~~ release-tool: Update phase 2 jobs to be considered phase 1 when forking a new branch Dec 13, 2023

oshoval closed this Dec 13, 2023

oshoval reopened this Dec 14, 2023

oshoval force-pushed the rtool branch from c42e6a2 to ac8a5d6 Compare December 14, 2023 11:54

kubevirt-bot added size/L and removed size/M labels Dec 14, 2023

oshoval force-pushed the rtool branch 2 times, most recently from da827f9 to 1776cdc Compare December 14, 2023 11:57

oshoval commented Dec 14, 2023

View reviewed changes

oshoval force-pushed the rtool branch 3 times, most recently from 96aee65 to 4e687a0 Compare December 19, 2023 13:19

kubevirt-bot added size/M and removed size/L labels Dec 19, 2023

oshoval force-pushed the rtool branch 2 times, most recently from 7a57108 to 050d731 Compare December 24, 2023 08:39

kubevirt-bot added size/L and removed size/M labels Dec 24, 2023

oshoval marked this pull request as ready for review December 24, 2023 08:40

kubevirt-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 24, 2023

kubevirt-bot requested a review from aglitke December 24, 2023 08:40

release-tool: Update phase 2 jobs to be considered phase 1 when forki…

45b45d6

…ng a new branch Signed-off-by: Or Shoval <oshoval@redhat.com>

oshoval force-pushed the rtool branch from 050d731 to 45b45d6 Compare December 24, 2023 09:22

kubevirt-bot requested review from brianmcarey and dhiller January 15, 2024 11:18

This was referenced Jan 18, 2024

Enable e2e lanes for latest kubernetes version #3188

Closed

Update test-infra dependency to make use of new prowjob config fields #3202

Closed

dhiller reviewed Mar 5, 2024

View reviewed changes

kubevirt-bot closed this Apr 7, 2024

oshoval mentioned this pull request Jun 19, 2024

New release branch presubmits are missing run_before_merge: true #3478

Open

kubevirt-bot reopened this Jul 3, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

release-tool: Update phase 2 jobs to be considered phase 1 when forking a new branch #3126

release-tool: Update phase 2 jobs to be considered phase 1 when forking a new branch #3126

oshoval commented Dec 13, 2023 •

edited

Loading

kubevirt-bot commented Dec 13, 2023

kubevirt-bot commented Dec 13, 2023

oshoval Dec 14, 2023 •

edited

Loading

oshoval commented Jan 15, 2024

dhiller Mar 5, 2024

oshoval Mar 5, 2024 •

edited

Loading

dhiller Mar 6, 2024

oshoval Apr 2, 2024

kubevirt-bot commented Mar 8, 2024 •

edited

Loading

oshoval commented Apr 7, 2024 •

edited

Loading

oshoval commented Apr 7, 2024

kubevirt-bot commented Apr 7, 2024

oshoval commented Jul 3, 2024

kubevirt-bot commented Jul 3, 2024

oshoval commented Jul 3, 2024 •

edited

Loading

brianmcarey commented Jul 3, 2024

release-tool: Update phase 2 jobs to be considered phase 1 when forking a new branch #3126

Are you sure you want to change the base?

release-tool: Update phase 2 jobs to be considered phase 1 when forking a new branch #3126

Conversation

oshoval commented Dec 13, 2023 • edited Loading

kubevirt-bot commented Dec 13, 2023

kubevirt-bot commented Dec 13, 2023

oshoval Dec 14, 2023 • edited Loading

Choose a reason for hiding this comment

oshoval commented Jan 15, 2024

dhiller Mar 5, 2024

Choose a reason for hiding this comment

oshoval Mar 5, 2024 • edited Loading

Choose a reason for hiding this comment

dhiller Mar 6, 2024

Choose a reason for hiding this comment

oshoval Apr 2, 2024

Choose a reason for hiding this comment

kubevirt-bot commented Mar 8, 2024 • edited Loading

oshoval commented Apr 7, 2024 • edited Loading

oshoval commented Apr 7, 2024

kubevirt-bot commented Apr 7, 2024

oshoval commented Jul 3, 2024

kubevirt-bot commented Jul 3, 2024

oshoval commented Jul 3, 2024 • edited Loading

brianmcarey commented Jul 3, 2024

oshoval commented Dec 13, 2023 •

edited

Loading

oshoval Dec 14, 2023 •

edited

Loading

oshoval Mar 5, 2024 •

edited

Loading

kubevirt-bot commented Mar 8, 2024 •

edited

Loading

oshoval commented Apr 7, 2024 •

edited

Loading

oshoval commented Jul 3, 2024 •

edited

Loading