Closed openshift-cherrypick-robot closed 1 year ago
@openshift-cherrypick-robot: Jira Issue OCPBUGS-8432 has been cloned as Jira Issue OCPBUGS-11185. Will retitle bug to link to clone. /retitle [release-4.11] OCPBUGS-11185: Make Java 11 the default
@openshift-cherrypick-robot: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh
.
@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-11185, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
The bug has been updated to refer to the pull request using the external bug tracker.
/cherry-pick release-4.10 /approve /lgtm /label backport-risk-assessed /label cherry-pick-approved
@coreydaley: once the present PR merges, I will cherry-pick it on top of release-4.10 in a new PR and assign it to you.
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: coreydaley, openshift-cherrypick-robot
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/jira refresh
@coreydaley: This pull request references Jira Issue OCPBUGS-11185, which is valid. The bug has been moved to the POST state.
Requesting review from QA contact: /cc @coreydaley
@openshift-cherrypick-robot: all tests passed!
Full PR test history. Your PR dashboard.
@openshift-cherrypick-robot: Jira Issue OCPBUGS-11185: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-11185 has been moved to the MODIFIED state.
@coreydaley: #1638 failed to apply on top of branch "release-4.10":
Applying: OCPBUGS-7233: Make Java 11 the default
Using index info to reconstruct a base tree...
M 2/Dockerfile.localdev
M 2/Dockerfile.rhel8
M slave-base/Dockerfile.localdev
M slave-base/Dockerfile.rhel8
Falling back to patching base and 3-way merge...
Auto-merging slave-base/Dockerfile.rhel8
CONFLICT (content): Merge conflict in slave-base/Dockerfile.rhel8
Auto-merging slave-base/Dockerfile.localdev
Auto-merging 2/Dockerfile.rhel8
Auto-merging 2/Dockerfile.localdev
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-7233: Make Java 11 the default
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".
This is an automated cherry-pick of #1610
/assign coreydaley