Closed apoorvajagtap closed 4 months ago
@apoorvajagtap: This pull request references Jira Issue OCPBUGS-33215, 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.
/retest
/assign @adambkaplan
/jira refresh
@apoorvajagtap: This pull request references Jira Issue OCPBUGS-33215, 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.
@apoorvajagtap: This pull request references Jira Issue OCPBUGS-33215, 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.
/jira refresh
@apoorvajagtap: This pull request references Jira Issue OCPBUGS-33215, which is valid.
/approve
@apoorvajagtap: 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 | 995d4fc941e0f5a7b6c4d3e6249d45e0589b5028 | link | false | /test security |
Full PR test history. Your PR dashboard.
/approve /lgtm
@apoorvajagtap: Jira Issue OCPBUGS-33215: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-33215 has been moved to the MODIFIED state.
[ART PR BUILD NOTIFIER]
This PR has been included in build openshift-enterprise-builder-container-v4.17.0-202406101611.p0.g739f527.assembly.stream.el9 for distgit openshift-enterprise-builder. All builds following this will include this PR.
/cherry-pick release-4.16
@apoorvajagtap: #394 failed to apply on top of branch "release-4.16":
Applying: bumps openshift/api: OCPBUGS-33215
Using index info to reconstruct a base tree...
M go.mod
M go.sum
A vendor/github.com/go-logr/logr/slogr/slogr.go
M vendor/golang.org/x/net/http2/frame.go
M vendor/golang.org/x/net/http2/server.go
M vendor/golang.org/x/net/http2/transport.go
M vendor/k8s.io/klog/v2/klog.go
A vendor/k8s.io/klog/v2/klogr_slog.go
M vendor/modules.txt
Falling back to patching base and 3-way merge...
Removing vendor/sigs.k8s.io/structured-merge-diff/v4/typed/union.go
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Removing vendor/k8s.io/kube-openapi/pkg/validation/spec/fuzz.go
Removing vendor/k8s.io/kube-openapi/pkg/schemamutation/walker.go
Removing vendor/k8s.io/kube-openapi/pkg/openapiconv/convert.go
Removing vendor/k8s.io/kube-openapi/pkg/builder3/util/util.go
CONFLICT (modify/delete): vendor/k8s.io/klog/v2/klogr_slog.go deleted in HEAD and modified in bumps openshift/api: OCPBUGS-33215. Version bumps openshift/api: OCPBUGS-33215 of vendor/k8s.io/klog/v2/klogr_slog.go left in tree.
Auto-merging vendor/k8s.io/klog/v2/klog.go
Auto-merging vendor/golang.org/x/net/http2/transport.go
Auto-merging vendor/golang.org/x/net/http2/server.go
Auto-merging vendor/golang.org/x/net/http2/frame.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 bumps openshift/api: OCPBUGS-33215
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".
The current vendored version of openshift/api doesn't include the changes merged with https://github.com/openshift/api/pull/1674. This commit bumps the openshift/api to the latest release-4.15 branch.