Closed praveenkumar closed 3 weeks ago
/cherry-pick release-4.16
@praveenkumar: once the present PR merges, I will cherry-pick it on top of release-4.16 in a new PR and assign it to you.
/cherry-pick release-4.15
@praveenkumar: once the present PR merges, I will cherry-pick it on top of release-4.15 in a new PR and assign it to you.
/approve /lgtm
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: cfergeau
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@praveenkumar: 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 |
---|---|---|---|---|
ci/prow/e2e-snc | 3abf868026cc3df5cdb8a99702d0f2464b30b1b6 | link | true | /test e2e-snc |
ci/prow/e2e-microshift | 3abf868026cc3df5cdb8a99702d0f2464b30b1b6 | link | true | /test e2e-microshift |
Full PR test history. Your PR dashboard.
@praveenkumar: new pull request created: #907
@praveenkumar: #906 failed to apply on top of branch "release-4.15":
Applying: CI: update golang container image to v1.21
Using index info to reconstruct a base tree...
M ci.sh
M ci_microshift.sh
Falling back to patching base and 3-way merge...
Auto-merging ci_microshift.sh
CONFLICT (content): Merge conflict in ci_microshift.sh
Auto-merging ci.sh
CONFLICT (content): Merge conflict in ci.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 CI: update golang container image to v1.21
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
crc codebase now uses go-1.21 and it fails to build with go-1.20 now.
Should fix following error in CI