Skip to content

[release-1.0] External controlplane e2e test #685

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.

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

Closed
istio-testing opened this issue Feb 27, 2025 · 1 comment
Closed

[release-1.0] External controlplane e2e test #685

istio-testing opened this issue Feb 27, 2025 · 1 comment
Assignees

Comments

@istio-testing
Copy link
Collaborator

Manual cherrypick required.

#676 failed to apply on top of branch "release-1.0":

Applying: e2e multicluster test improve
Using index info to reconstruct a base tree...
M	docs/README.md
M	pkg/istioversion/version.go
M	tests/e2e/ambient/ambient_suite_test.go
M	tests/e2e/controlplane/control_plane_suite_test.go
M	tests/e2e/dualstack/dualstack_suite_test.go
M	tests/e2e/multicluster/multicluster_suite_test.go
M	tests/e2e/multicontrolplane/multi_control_plane_suite_test.go
M	tests/e2e/operator/operator_suite_test.go
M	tests/e2e/util/common/e2e_utils.go
A	tests/e2e/util/env/env.go
M	tests/e2e/util/istioctl/istioctl.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/util/istioctl/istioctl.go
Auto-merging tests/e2e/util/common/e2e_utils.go
Auto-merging tests/e2e/operator/operator_suite_test.go
Auto-merging tests/e2e/multicontrolplane/multi_control_plane_suite_test.go
Auto-merging tests/e2e/multicluster/multicluster_suite_test.go
CONFLICT (content): Merge conflict in tests/e2e/multicluster/multicluster_suite_test.go
Auto-merging tests/e2e/controlplane/control_plane_suite_test.go
CONFLICT (content): Merge conflict in tests/e2e/controlplane/control_plane_suite_test.go
Auto-merging pkg/env/env.go
Auto-merging docs/README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 e2e multicluster test improve

@fjglira
Copy link
Contributor

fjglira commented Apr 15, 2025

Not needed anymore

@fjglira fjglira closed this as completed Apr 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants