Skip to content

Commit

Permalink
Revert "Enable load balancer for flare e2e tests as we have failure i…
Browse files Browse the repository at this point in the history
…n the CI (#20724)"

This reverts commit b62a134.
  • Loading branch information
Kaderinho committed Nov 29, 2023
1 parent 2017a14 commit 2d4b470
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion test/new-e2e/tests/agent-subcommands/flare/flare_nix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/DataDog/datadog-agent/test/new-e2e/pkg/utils/e2e"
"github.com/DataDog/datadog-agent/test/new-e2e/pkg/utils/e2e/client"
"github.com/DataDog/test-infra-definitions/components/datadog/agentparams"
"github.com/DataDog/test-infra-definitions/scenarios/aws/fakeintake/fakeintakeparams"
"github.com/DataDog/test-infra-definitions/scenarios/aws/vm/ec2os"
"github.com/DataDog/test-infra-definitions/scenarios/aws/vm/ec2params"
)
Expand All @@ -33,7 +34,7 @@ type linuxFlareSuite struct {

func TestLinuxFlareSuite(t *testing.T) {
t.Parallel()
e2e.Run(t, &linuxFlareSuite{}, e2e.FakeIntakeStackDef(e2e.WithVMParams(ec2params.WithOS(ec2os.UbuntuOS))))
e2e.Run(t, &linuxFlareSuite{}, e2e.FakeIntakeStackDef(e2e.WithVMParams(ec2params.WithOS(ec2os.UbuntuOS)), e2e.WithFakeIntakeParams(fakeintakeparams.WithoutLoadBalancer())))
}

func (v *linuxFlareSuite) TestFlareWithAllConfiguration() {
Expand Down
3 changes: 2 additions & 1 deletion test/new-e2e/tests/agent-subcommands/flare/flare_win_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/DataDog/datadog-agent/test/new-e2e/pkg/utils/e2e"
"github.com/DataDog/datadog-agent/test/new-e2e/pkg/utils/e2e/client"
"github.com/DataDog/test-infra-definitions/scenarios/aws/fakeintake/fakeintakeparams"
"github.com/DataDog/test-infra-definitions/scenarios/aws/vm/ec2os"
"github.com/DataDog/test-infra-definitions/scenarios/aws/vm/ec2params"
"github.com/stretchr/testify/assert"
Expand All @@ -22,7 +23,7 @@ type windowsFlareSuite struct {

func TestWindowsFlareSuite(t *testing.T) {
t.Parallel()
e2e.Run(t, &windowsFlareSuite{}, e2e.FakeIntakeStackDef(e2e.WithVMParams(ec2params.WithOS(ec2os.WindowsOS))))
e2e.Run(t, &windowsFlareSuite{}, e2e.FakeIntakeStackDef(e2e.WithVMParams(ec2params.WithOS(ec2os.WindowsOS)), e2e.WithFakeIntakeParams(fakeintakeparams.WithoutLoadBalancer())))
}

func (v *windowsFlareSuite) TestFlareWindows() {
Expand Down

0 comments on commit 2d4b470

Please sign in to comment.