From 070a5edfc193bc13bfd0c201fd712edf987da0d3 Mon Sep 17 00:00:00 2001 From: Bryce Kahle Date: Thu, 21 May 2026 13:03:53 -0700 Subject: [PATCH] redo e2e connection configuration Accidentally removed in #43453 --- test/e2e-framework/scenarios/aws/ec2/vm.go | 2 ++ .../scenarios/aws/microVMs/microvms/provision.go | 7 ++++++- test/e2e-framework/scenarios/aws/microVMs/microvms/run.go | 2 +- test/e2e-framework/scenarios/azure/compute/vm.go | 2 ++ test/e2e-framework/scenarios/local/podman/vm.go | 2 ++ 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/test/e2e-framework/scenarios/aws/ec2/vm.go b/test/e2e-framework/scenarios/aws/ec2/vm.go index 7b62a8446bd1..0aad2049c2b6 100644 --- a/test/e2e-framework/scenarios/aws/ec2/vm.go +++ b/test/e2e-framework/scenarios/aws/ec2/vm.go @@ -86,6 +86,8 @@ func NewVM(e aws.Environment, name string, params ...VMOption) (*remote.Host, er sshUser, remote.WithPrivateKeyPath(e.DefaultPrivateKeyPath()), remote.WithPrivateKeyPassword(e.DefaultPrivateKeyPassword()), + remote.WithDialErrorLimit(e.InfraDialErrorLimit()), + remote.WithPerDialTimeoutSeconds(e.InfraPerDialTimeoutSeconds()), ) if err != nil { return err diff --git a/test/e2e-framework/scenarios/aws/microVMs/microvms/provision.go b/test/e2e-framework/scenarios/aws/microVMs/microvms/provision.go index 63ab2a0243f6..530a56b2f583 100644 --- a/test/e2e-framework/scenarios/aws/microVMs/microvms/provision.go +++ b/test/e2e-framework/scenarios/aws/microVMs/microvms/provision.go @@ -14,6 +14,7 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/pulumi" "github.com/pulumi/pulumi/sdk/v3/go/pulumi/config" + commonConfig "github.com/DataDog/datadog-agent/test/e2e-framework/common/config" "github.com/DataDog/datadog-agent/test/e2e-framework/common/namer" "github.com/DataDog/datadog-agent/test/e2e-framework/components/command" remoteComp "github.com/DataDog/datadog-agent/test/e2e-framework/components/remote" @@ -237,6 +238,8 @@ func provisionRemoteMicroVMs(vmCollections []*VMCollection, instanceEnv *Instanc "ubuntu", remoteComp.WithPrivateKeyPath(instanceEnv.DefaultPrivateKeyPath()), remoteComp.WithPrivateKeyPassword(instanceEnv.DefaultPrivateKeyPassword()), + remoteComp.WithDialErrorLimit(instanceEnv.InfraDialErrorLimit()), + remoteComp.WithPerDialTimeoutSeconds(instanceEnv.InfraPerDialTimeoutSeconds()), ) if err != nil { return nil, err @@ -281,7 +284,7 @@ func provisionRemoteMicroVMs(vmCollections []*VMCollection, instanceEnv *Instanc return waitFor, nil } -func provisionLocalMicroVMs(vmCollections []*VMCollection) ([]pulumi.Resource, error) { +func provisionLocalMicroVMs(vmCollections []*VMCollection, e commonConfig.CommonEnvironment) ([]pulumi.Resource, error) { var waitFor []pulumi.Resource for _, collection := range vmCollections { if collection.instance.Arch != LocalVMSet { @@ -299,6 +302,8 @@ func provisionLocalMicroVMs(vmCollections []*VMCollection) ([]pulumi.Resource, e domain.ip, "root", remoteComp.WithPrivateKeyPath(filepath.Join(GetWorkingDirectory(domain.vmset.Arch), "ddvm_rsa")), + remoteComp.WithDialErrorLimit(e.InfraDialErrorLimit()), + remoteComp.WithPerDialTimeoutSeconds(e.InfraPerDialTimeoutSeconds()), ) if err != nil { return nil, err diff --git a/test/e2e-framework/scenarios/aws/microVMs/microvms/run.go b/test/e2e-framework/scenarios/aws/microVMs/microvms/run.go index c8b61f05d79b..98846f269931 100644 --- a/test/e2e-framework/scenarios/aws/microVMs/microvms/run.go +++ b/test/e2e-framework/scenarios/aws/microVMs/microvms/run.go @@ -370,7 +370,7 @@ func run(e commonConfig.CommonEnvironment) (*ScenarioDone, error) { return nil, err } - if _, err := provisionLocalMicroVMs(vmCollections); err != nil { + if _, err := provisionLocalMicroVMs(vmCollections, e); err != nil { return nil, err } } diff --git a/test/e2e-framework/scenarios/azure/compute/vm.go b/test/e2e-framework/scenarios/azure/compute/vm.go index a1b47a783bbf..9bf9457dfeb5 100644 --- a/test/e2e-framework/scenarios/azure/compute/vm.go +++ b/test/e2e-framework/scenarios/azure/compute/vm.go @@ -71,6 +71,8 @@ func NewVM(e azure.Environment, name string, params ...VMOption) (*remote.Host, compute.AdminUsername, remote.WithPrivateKeyPath(e.DefaultPrivateKeyPath()), remote.WithPrivateKeyPassword(e.DefaultPrivateKeyPassword()), + remote.WithDialErrorLimit(e.InfraDialErrorLimit()), + remote.WithPerDialTimeoutSeconds(e.InfraPerDialTimeoutSeconds()), ) if err != nil { return err diff --git a/test/e2e-framework/scenarios/local/podman/vm.go b/test/e2e-framework/scenarios/local/podman/vm.go index 6f1d499572dd..73552b1b7e93 100644 --- a/test/e2e-framework/scenarios/local/podman/vm.go +++ b/test/e2e-framework/scenarios/local/podman/vm.go @@ -35,6 +35,8 @@ func NewVM(e local.Environment, name string) (*remote.Host, error) { address, user, remote.WithPort(port), + remote.WithDialErrorLimit(e.InfraDialErrorLimit()), + remote.WithPerDialTimeoutSeconds(e.InfraPerDialTimeoutSeconds()), ) if err != nil { return err