Skip to content
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

release-tool: fix config-forking #3958

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

dhiller
Copy link
Contributor

@dhiller dhiller commented Feb 14, 2025

What this PR does / why we need it:

config-forking was broken in a couple of ways:

  • it used an old version of the config-forker from test-infra which didn't retain the value for run_before_merge
  • it didn't update the forked config, since for release branches the phase plugin didn't work in the same way, therefore the values had to be converted from run_before_merge to always_run

This PR fixes the issues.

We also now use this opportunity to remove the bazel cache label since
we need to do that every time anyways: #3961

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #3478

Special notes for your reviewer:
/cc @xpivarc @enp0s3

@kubevirt-bot
Copy link
Contributor

[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 ask for approval from dhiller. For more information see the 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:

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

@@ -457,3 +460,37 @@ func TestNewTag(t *testing.T) {
}
}
}

func Test_convertRunBeforeMergeToAlwaysRun(t *testing.T) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Without the _

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As said in another PR, since this is a non-exported function the IDE would not find it. Also it's more clear and less annoying to read (IMHO) - but if you insist...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

^^ this is what I mean

@dhiller dhiller force-pushed the fix-release-tool-config-fork branch 3 times, most recently from 6a9cf87 to 4e2135e Compare February 17, 2025 10:33
@dhiller
Copy link
Contributor Author

dhiller commented Feb 17, 2025

@xpivarc renamed test func, PTAL, thanks!

config-forking was broken in a couple of ways:
* it used an old version of the config-forker from test-infra which
  didn't retain the value for `run_before_merge`
* it didn't update the forked config, since for release branches the
  phase plugin didn't work in the same way, therefore the values had to
  be converted from run_before_merge to to always_run

We also now use this opportunity to remove the bazel cache label since
we need to do that every time anyways:
kubevirt#3961

This commit fixes the issues.

Signed-off-by: Daniel Hiller <[email protected]>
@dhiller dhiller force-pushed the fix-release-tool-config-fork branch from 4e2135e to 4db3d2e Compare February 18, 2025 16:02
@dhiller
Copy link
Contributor Author

dhiller commented Feb 18, 2025

@xpivarc updated PR, PTAL, thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dco-signoff: yes Indicates the PR's author has DCO signed all their commits. size/XXL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

New release branch presubmits are missing run_before_merge: true
3 participants