Closed mimowo closed 2 weeks ago
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: mimowo
The full list of commands accepted by this bot can be found here.
The pull request process is described here
Name | Link |
---|---|
Latest commit | f126604c52f24abce9490d9e024b8e143182639f |
Latest deploy log | https://app.netlify.com/sites/kubernetes-sigs-kueue/deploys/6737a67f0e59d2000838d29b |
/lgtm Thanks!
LGTM label has been added.
/cherry-pick release-0.9
@mimowo: #3559 failed to apply on top of branch "release-0.9":
Applying: TAS: fix scenario when parallelism < completions
Using index info to reconstruct a base tree...
M pkg/controller/tas/topology_ungater.go
A test/e2e/tas/tas_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/e2e/tas/tas_test.go deleted in HEAD and modified in TAS: fix scenario when parallelism < completions. Version TAS: fix scenario when parallelism < completions of test/e2e/tas/tas_test.go left in tree.
Auto-merging pkg/controller/tas/topology_ungater.go
CONFLICT (content): Merge conflict in pkg/controller/tas/topology_ungater.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 TAS: fix scenario when parallelism < completions
What type of PR is this?
/kind bug
What this PR does / why we need it:
Which issue(s) this PR fixes:
Part of #3450
Special notes for your reviewer:
Does this PR introduce a user-facing change?