Skip to content

redo e2e connection configuration #51180

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

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

redo e2e connection configuration #51180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions test/e2e-framework/scenarios/aws/ec2/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion test/e2e-framework/scenarios/aws/microVMs/microvms/provision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-framework/scenarios/aws/microVMs/microvms/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
2 changes: 2 additions & 0 deletions test/e2e-framework/scenarios/azure/compute/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/e2e-framework/scenarios/local/podman/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading