Closed sayan-biswas closed 5 months ago
@sayan-biswas: This pull request references Jira Issue OCPBUGS-32873, which is valid. The bug has been moved to the POST state.
Requesting review from QA contact: /cc @jitendar-singh
The bug has been updated to refer to the pull request using the external bug tracker.
/test e2e-hypershift-conformance
If you have to cherry-pick, then I suggest you command the bot before PR merges, if seems the bot doesn't work on closed PR.
If you have to cherry-pick, then I suggest you command the bot before PR merges, if seems the bot doesn't work on closed PR.
But I guess cherry-pick bot is configured to work with minimum "merged" status. Isn't it?
But I guess cherry-pick bot is configured to work with minimum "merged" status. Isn't it?
Yes, it will only open cherrypick PR once merged, but the bot ignores command after merging it seems.
/test e2e-aws-ovn
@sayan-biswas: The following test 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/security | 6bbfd9a43f96cb0f90c279363133c3e46ee3559f | link | false | /test security |
Full PR test history. Your PR dashboard.
/lgtm
@sayan-biswas: you cannot LGTM your own PR.
/label backport-risk-assessed /label cherry-pick-approved /label px-approved /label docs-approved /label qe-approved
@sayan-biswas: This pull request references Jira Issue OCPBUGS-32873, which is valid.
Requesting review from QA contact: /cc @jitendar-singh
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: avinal, ayushsatyam146, sayan-biswas
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@sayan-biswas: Jira Issue OCPBUGS-32873: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-32873 has been moved to the MODIFIED state.
/cherrypick release-4.16 release-4.15 release-4.14 release-4.13 release-4.12
@sayan-biswas: #315 failed to apply on top of branch "release-4.16":
Applying: OCPBUGS-32873: Replace deprecated gopkg.in/square/go-jose.v2
Using index info to reconstruct a base tree...
M go.mod
M go.sum
M vendor/golang.org/x/sys/unix/mkerrors.sh
M vendor/golang.org/x/sys/unix/zerrors_linux.go
M vendor/golang.org/x/sys/unix/zerrors_linux_386.go
M vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
M vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go.git/rebase-apply/patch:3173: trailing whitespace.
.git/rebase-apply/patch:3173: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
M vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
M vendor/golang.org/x/sys/unix/ztypes_linux.go
M vendor/golang.org/x/sys/windows/syscall_windows.go
M vendor/golang.org/x/sys/windows/zsyscall_windows.go
M vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
Removing vendor/golang.org/x/sys/windows/empty.s
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux.go
Auto-merging vendor/golang.org/x/sys/unix/mkerrors.sh
Removing vendor/golang.org/x/sys/unix/fstatfs_zos.go
Removing vendor/golang.org/x/sys/unix/epoll_zos.go
Removing vendor/golang.org/x/crypto/sha3/xor_unaligned.go
Removing vendor/golang.org/x/crypto/sha3/xor_generic.go
Removing vendor/golang.org/x/crypto/sha3/shake_generic.go
Removing vendor/golang.org/x/crypto/sha3/hashes_generic.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
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-32873: Replace deprecated gopkg.in/square/go-jose.v2
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".
/remove-label cherry-pick-approved
/remove-label backport-risk-assessed
/cherrypick release-4.17
@sayan-biswas: new pull request created: #316
/cherrypick release-4.18
@sayan-biswas: new pull request created: #317
[ART PR BUILD NOTIFIER]
This PR has been included in build ose-openshift-controller-manager-container-v4.17.0-202406121116.p0.gdc54a28.assembly.stream.el9 for distgit ose-openshift-controller-manager. All builds following this will include this PR.
/cherrypick release-4.16 release-4.15
@sayan-biswas: #315 failed to apply on top of branch "release-4.16":
Applying: OCPBUGS-32873: Replace deprecated gopkg.in/square/go-jose.v2
Using index info to reconstruct a base tree...
M go.mod
M go.sum
M vendor/golang.org/x/sys/unix/mkerrors.sh
M vendor/golang.org/x/sys/unix/zerrors_linux.go
M vendor/golang.org/x/sys/unix/zerrors_linux_386.go
M vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
M vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
M vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go.git/rebase-apply/patch:3173: trailing whitespace.
.git/rebase-apply/patch:3173: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
M vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
M vendor/golang.org/x/sys/unix/ztypes_linux.go
M vendor/golang.org/x/sys/windows/syscall_windows.go
M vendor/golang.org/x/sys/windows/zsyscall_windows.go
M vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
Removing vendor/golang.org/x/sys/windows/empty.s
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux.go
Auto-merging vendor/golang.org/x/sys/unix/mkerrors.sh
Removing vendor/golang.org/x/sys/unix/fstatfs_zos.go
Removing vendor/golang.org/x/sys/unix/epoll_zos.go
Removing vendor/golang.org/x/crypto/sha3/xor_unaligned.go
Removing vendor/golang.org/x/crypto/sha3/xor_generic.go
Removing vendor/golang.org/x/crypto/sha3/shake_generic.go
Removing vendor/golang.org/x/crypto/sha3/hashes_generic.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
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-32873: Replace deprecated gopkg.in/square/go-jose.v2
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".
Replace deprecated gopkg.in/square/go-jose.v2 with github.com/go-jose/go-jose/v3
Fixes the following CVE(s):