Skip to content

fix: update merge bug launch.go #39

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Conversation

ritwikranjan
Copy link

@ritwikranjan ritwikranjan commented May 23, 2025

This pull request addresses a small cleanup in the network/benchmarks/netperf/launch.go file by resolving a merge conflict artifact.

@jimassa
Copy link

jimassa commented May 23, 2025

I still see those merge conflict markers thorughout the file, try running launch.go to catch them all.

@ritwikranjan ritwikranjan force-pushed the ritwikranjan-patch-2 branch from 7a7b3d4 to 4e2bdcb Compare May 27, 2025 16:54
@ritwikranjan ritwikranjan requested a review from Copilot May 27, 2025 16:58
Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR cleans up merge conflict artifacts in the network/benchmarks/netperf/launch.go file. The key changes include the removal of merge conflict markers and extraneous code blocks, and the consolidation of test execution logic by using the lib.TestParams configuration.

Comments suppressed due to low confidence (2)

network/benchmarks/netperf/launch.go:80

  • The merge conflict markers have been removed and only the flag configuration is retained. Verify that this resolution aligns with the intended behavior and that no necessary flag configurations were inadvertently removed.
flag.BoolVar(&jsonOutput, "json", false, "Output JSON data along with CSV data")

network/benchmarks/netperf/launch.go:91

  • The change in the main function removes the explicit Kubernetes client setup and test orchestration code in favor of a TestParams configuration. Please ensure that this new approach covers all required steps for test execution in your environment.
testParams := lib.TestParams{

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 this pull request may close these issues.

2 participants