Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: generator of object names #306

Merged
merged 1 commit into from
Jan 4, 2024
Merged

fix: generator of object names #306

merged 1 commit into from
Jan 4, 2024

Conversation

ksimon1
Copy link
Member

@ksimon1 ksimon1 commented Jan 4, 2024

What this PR does / why we need it:
fix: generator of object names
Sometimes the generator returned the same hash which led to errors in tests. This commit changes the generator to use the remainder after division of random number to generate 5 char hash

Release note:

NONE

@kubevirt-bot kubevirt-bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. size/L labels Jan 4, 2024
@openshift-ci openshift-ci bot requested review from codingben and jcanocan January 4, 2024 08:50
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jan 4, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ksimon1

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 4, 2024
@kubevirt-bot kubevirt-bot requested a review from 0xFelix January 4, 2024 08:50
@ksimon1
Copy link
Member Author

ksimon1 commented Jan 4, 2024

/retest

1 similar comment
@ksimon1
Copy link
Member Author

ksimon1 commented Jan 4, 2024

/retest

@jcanocan
Copy link
Contributor

jcanocan commented Jan 4, 2024

This is great! There's still a chance to get collisions. But this should be enough for this purpose. If this is really a problem, consider to increase the number of bytes.
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 4, 2024
@ksimon1
fix: generator of object names
4d5c236 
Sometimes the generator returned the same hash which led to errors in
tests. This commit changes the generator to use the k8s rand package
which will generate hash

Signed-off-by: Karel Simon <[email protected]>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 4, 2024
@akrejcir
Copy link
Contributor

akrejcir commented Jan 4, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 4, 2024
@ksimon1 ksimon1 merged commit eb07bb4 into kubevirt:main Jan 4, 2024
7 checks passed
@ksimon1
Copy link
Member Author

ksimon1 commented Jan 8, 2024

/cherry-pick release-v0.17

@kubevirt-bot
Copy link
Contributor

@ksimon1: new pull request created: #308

In response to this:

/cherry-pick release-v0.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot
Copy link

@ksimon1: new pull request created: #307

In response to this:

/cherry-pick release-v0.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 8, 2024
Closed
@kubevirt-bot kubevirt-bot mentioned this pull request Jan 8, 2024
Merged
@ksimon1
Copy link
Member Author

ksimon1 commented Jan 10, 2024

/cherry-pick release-v0.15

@kubevirt-bot
Copy link
Contributor

@ksimon1: #306 failed to apply on top of branch "release-v0.15":

Applying: fix: generator of object names
Using index info to reconstruct a base tree...
M	modules/sharedtest/go.mod
M	modules/sharedtest/go.sum
A	modules/sharedtest/vendor/github.com/go-logr/logr/funcr/funcr.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/CONTRIBUTING.md
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/README.md
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/RELEASING.md
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/core_dsl.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/decorator_dsl.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/deprecated_dsl.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/group.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/interrupt_handler/interrupt_handler.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/node.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/output_interceptor.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/output_interceptor_unix.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/client_server.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/http_client.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/http_server.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/rpc_client.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/server_handler.go
A	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go
A	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_bsd.go
A	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_unix.go
A	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_win.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/spec.go
A	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/spec_context.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/suite.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/writer.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/default_reporter.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/junit_report.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/reporter.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/teamcity_report.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporting_dsl.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/table_dsl.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/code_location.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/config.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/errors.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/report_entry.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/types.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/version.go
M	modules/sharedtest/vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging modules/sharedtest/vendor/modules.txt
CONFLICT (content): Merge conflict in modules/sharedtest/vendor/modules.txt
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_zos_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_openbsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_openbsd_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_openbsd_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_aix_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_aix_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_zos_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_openbsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_openbsd_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_openbsd_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_freebsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysctl_openbsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysctl_openbsd_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysctl_openbsd_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysctl_openbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_loong64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zptrace_x86_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_zos_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_openbsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_openbsd_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_openbsd_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_freebsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_aix_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_aix_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/xattr_bsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/unveil_openbsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/timestruct.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/sysvshm_unix_other.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/sysvshm_unix.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/sysvshm_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_unix_gc_ppc64x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_unix_gc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_unix.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_solaris.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_libc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_netbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_netbsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_gc_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_gc_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_gc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_amd64_gc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_alarm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_illumos.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_hurd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_hurd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_freebsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_darwin.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_bsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_aix_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_aix_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_aix.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/sockcmsg_dragonfly.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/readdirent_getdirentries.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/readdirent_getdents.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/race0.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/race.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ptrace_ios.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ptrace_darwin.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/pledge_openbsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/pagesize_unix.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/mremap.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/mmap_nomremap.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/mkerrors.sh
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/mkall.sh
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ioctl_zos.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ioctl_unsigned.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ioctl_signed.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ioctl_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ifreq_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/gccgo_c.c
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/gccgo.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/fstatfs_zos.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/fdset.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/fcntl_darwin.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/fcntl.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/epoll_zos.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/env_unix.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/endian_little.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/endian_big.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dirent.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_zos.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_openbsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_netbsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_freebsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_dragonfly.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_darwin.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_aix_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_aix_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/constants.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/cap_freebsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/bluetooth_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_zos_s390x.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_openbsd_mips64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_riscv64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_loong64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_arm.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_386.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_bsd_riscv64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_bsd_ppc64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_bsd_arm64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_bsd_arm.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_bsd_amd64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_bsd_386.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_aix_ppc64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/aliases.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/affinity_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/README.md
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/.gitignore
Removing modules/sharedtest/vendor/golang.org/x/sys/PATENTS
Removing modules/sharedtest/vendor/golang.org/x/sys/LICENSE
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/version.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/version.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/types.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/types.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/report_entry.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/report_entry.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/label_filter.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/flags.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/file_filter.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/errors.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/errors.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/enum_support.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/deprecation_support.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/deprecated_types.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/config.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/config.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/code_location.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/code_location.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/table_dsl.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/table_dsl.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporting_dsl.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporting_dsl.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/teamcity_report.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/teamcity_report.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/reporter.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/reporter.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/junit_report.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/junit_report.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/json_report.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/deprecated_reporter.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/default_reporter.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/default_reporter.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/writer.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/writer.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/tree.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/testingtproxy/testing_t_proxy.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/suite.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/suite.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/spec.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/spec.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/report_entry.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/server_handler.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/server_handler.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/rpc_server.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/rpc_client.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/rpc_client.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/http_server.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/http_server.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/http_client.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/http_client.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/client_server.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/client_server.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/output_interceptor_win.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/output_interceptor_unix.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/output_interceptor_unix.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/output_interceptor.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/output_interceptor.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/ordering.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/node.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/node.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/interrupt_handler/sigquit_swallower_windows.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/interrupt_handler/sigquit_swallower_unix.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/interrupt_handler/interrupt_handler.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/interrupt_handler/interrupt_handler.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/group.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/group.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/global/init.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/focus.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/failer.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/counter.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/ginkgo_t_dsl.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/formatter/formatter.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/formatter/colorable_windows.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/formatter/colorable_others.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/deprecated_dsl.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/deprecated_dsl.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/decorator_dsl.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/decorator_dsl.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/core_dsl.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/core_dsl.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/config/deprecated.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/RELEASING.md deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/RELEASING.md left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/README.md deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/README.md left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/LICENSE
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/CONTRIBUTING.md deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/CONTRIBUTING.md left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/.gitignore
Auto-merging modules/sharedtest/go.sum
CONFLICT (content): Merge conflict in modules/sharedtest/go.sum
Auto-merging modules/sharedtest/go.mod
CONFLICT (content): Merge conflict in modules/sharedtest/go.mod
CONFLICT (rename/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_win.go deleted in fix: generator of object names and renamed to modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_win.go in HEAD. Version HEAD of modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_win.go left in tree.
CONFLICT (rename/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_unix.go deleted in fix: generator of object names and renamed to modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_unix.go in HEAD. Version HEAD of modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_unix.go left in tree.
CONFLICT (rename/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_bsd.go deleted in fix: generator of object names and renamed to modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_bsd.go in HEAD. Version HEAD of modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_bsd.go left in tree.
CONFLICT (rename/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go deleted in fix: generator of object names and renamed to modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go in HEAD. Version HEAD of modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: generator of object names
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".

In response to this:

/cherry-pick release-v0.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot
Copy link

@ksimon1: #306 failed to apply on top of branch "release-v0.15":

Applying: fix: generator of object names
Using index info to reconstruct a base tree...
M	modules/sharedtest/go.mod
M	modules/sharedtest/go.sum
A	modules/sharedtest/vendor/github.com/go-logr/logr/funcr/funcr.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/CONTRIBUTING.md
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/README.md
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/RELEASING.md
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/core_dsl.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/decorator_dsl.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/deprecated_dsl.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/group.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/interrupt_handler/interrupt_handler.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/node.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/output_interceptor.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/output_interceptor_unix.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/client_server.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/http_client.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/http_server.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/rpc_client.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/server_handler.go
A	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go
A	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_bsd.go
A	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_unix.go
A	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_win.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/spec.go
A	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/spec_context.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/suite.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/writer.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/default_reporter.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/junit_report.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/reporter.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/teamcity_report.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporting_dsl.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/table_dsl.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/code_location.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/config.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/errors.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/report_entry.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/types.go
M	modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/version.go
M	modules/sharedtest/vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging modules/sharedtest/vendor/modules.txt
CONFLICT (content): Merge conflict in modules/sharedtest/vendor/modules.txt
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_zos_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_openbsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_openbsd_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_openbsd_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_aix_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ztypes_aix_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_zos_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_openbsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_openbsd_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_openbsd_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_freebsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysctl_openbsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysctl_openbsd_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysctl_openbsd_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsysctl_openbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_loong64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zptrace_x86_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_zos_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_openbsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_openbsd_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_openbsd_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_freebsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_aix_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/zerrors_aix_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/xattr_bsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/unveil_openbsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/timestruct.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/sysvshm_unix_other.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/sysvshm_unix.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/sysvshm_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_unix_gc_ppc64x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_unix_gc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_unix.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_solaris.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_mips64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_libc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_openbsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_netbsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_netbsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_gc_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_gc_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_gc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_amd64_gc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_alarm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_illumos.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_hurd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_hurd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_freebsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_darwin.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_bsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_aix_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_aix_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall_aix.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/syscall.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/sockcmsg_dragonfly.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/readdirent_getdirentries.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/readdirent_getdents.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/race0.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/race.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ptrace_ios.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ptrace_darwin.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/pledge_openbsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/pagesize_unix.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/mremap.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/mmap_nomremap.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/mkerrors.sh
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/mkall.sh
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ioctl_zos.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ioctl_unsigned.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ioctl_signed.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ioctl_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/ifreq_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/gccgo_c.c
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/gccgo.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/fstatfs_zos.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/fdset.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/fcntl_darwin.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/fcntl.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/epoll_zos.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/env_unix.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/endian_little.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/endian_big.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dirent.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_zos.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_openbsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_netbsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_freebsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_dragonfly.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_darwin.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_aix_ppc64.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/dev_aix_ppc.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/constants.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/cap_freebsd.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/bluetooth_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_zos_s390x.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_openbsd_mips64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_riscv64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_loong64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_arm.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_linux_386.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_bsd_riscv64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_bsd_ppc64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_bsd_arm64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_bsd_arm.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_bsd_amd64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_bsd_386.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/asm_aix_ppc64.s
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/aliases.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/affinity_linux.go
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/README.md
Removing modules/sharedtest/vendor/golang.org/x/sys/unix/.gitignore
Removing modules/sharedtest/vendor/golang.org/x/sys/PATENTS
Removing modules/sharedtest/vendor/golang.org/x/sys/LICENSE
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/version.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/version.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/types.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/types.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/report_entry.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/report_entry.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/label_filter.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/flags.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/file_filter.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/errors.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/errors.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/enum_support.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/deprecation_support.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/deprecated_types.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/config.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/config.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/code_location.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/types/code_location.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/table_dsl.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/table_dsl.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporting_dsl.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporting_dsl.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/teamcity_report.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/teamcity_report.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/reporter.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/reporter.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/junit_report.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/junit_report.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/json_report.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/deprecated_reporter.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/default_reporter.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/reporters/default_reporter.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/writer.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/writer.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/tree.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/testingtproxy/testing_t_proxy.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/suite.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/suite.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/spec.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/spec.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/report_entry.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/server_handler.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/server_handler.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/rpc_server.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/rpc_client.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/rpc_client.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/http_server.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/http_server.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/http_client.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/http_client.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/client_server.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/client_server.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/output_interceptor_win.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/output_interceptor_unix.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/output_interceptor_unix.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/output_interceptor.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/output_interceptor.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/ordering.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/node.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/node.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/interrupt_handler/sigquit_swallower_windows.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/interrupt_handler/sigquit_swallower_unix.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/interrupt_handler/interrupt_handler.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/interrupt_handler/interrupt_handler.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/group.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/group.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/global/init.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/focus.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/failer.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/counter.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/ginkgo_t_dsl.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/formatter/formatter.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/formatter/colorable_windows.go
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/formatter/colorable_others.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/deprecated_dsl.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/deprecated_dsl.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/decorator_dsl.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/decorator_dsl.go left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/core_dsl.go deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/core_dsl.go left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/config/deprecated.go
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/RELEASING.md deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/RELEASING.md left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/README.md deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/README.md left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/LICENSE
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/CONTRIBUTING.md deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/CONTRIBUTING.md left in tree.
CONFLICT (modify/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md deleted in fix: generator of object names and modified in HEAD. Version HEAD of modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md left in tree.
Removing modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/.gitignore
Auto-merging modules/sharedtest/go.sum
CONFLICT (content): Merge conflict in modules/sharedtest/go.sum
Auto-merging modules/sharedtest/go.mod
CONFLICT (content): Merge conflict in modules/sharedtest/go.mod
CONFLICT (rename/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_win.go deleted in fix: generator of object names and renamed to modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_win.go in HEAD. Version HEAD of modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_win.go left in tree.
CONFLICT (rename/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_unix.go deleted in fix: generator of object names and renamed to modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_unix.go in HEAD. Version HEAD of modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_unix.go left in tree.
CONFLICT (rename/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_bsd.go deleted in fix: generator of object names and renamed to modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_bsd.go in HEAD. Version HEAD of modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report_bsd.go left in tree.
CONFLICT (rename/delete): modules/sharedtest/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go deleted in fix: generator of object names and renamed to modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go in HEAD. Version HEAD of modules/create-vm/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: generator of object names
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".

In response to this:

/cherry-pick release-v0.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ksimon1 ksimon1 mentioned this pull request Jan 10, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akrejcir akrejcir akrejcir left review comments

@codingben codingben Awaiting requested review from codingben

@jcanocan jcanocan Awaiting requested review from jcanocan

@0xFelix 0xFelix Awaiting requested review from 0xFelix

Assignees

@akrejcir akrejcir

@jcanocan jcanocan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. size/XXL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ksimon1 @jcanocan @akrejcir @kubevirt-bot @openshift-cherrypick-robot