Merge pull request #3153 from mboersma/add-ssh-test-timeout

k8s-ci-robot · web-flow · commit 9164a3175cd5 · 2023-02-08T10:09:05.000-08:00
Add 30s timeout to test helper SSH config
diff --git a/test/e2e/helpers.go b/test/e2e/helpers.go
@@ -76,6 +76,7 @@ const (
 	retryableDeleteOperationTimeout       = 3 * time.Minute
 	retryableOperationSleepBetweenRetries = 3 * time.Second
 	helmInstallTimeout                    = 3 * time.Minute
+	sshConnectionTimeout                  = 30 * time.Second
 )
 
 // deploymentsClientAdapter adapts a Deployment to work with WaitForDeploymentsAvailable.
@@ -591,6 +592,7 @@ func newSSHConfig() (*ssh.ClientConfig, error) {
 		HostKeyCallback: ssh.InsecureIgnoreHostKey(), //nolint:gosec // Non-production code
 		User:            azure.DefaultUserName,
 		Auth:            []ssh.AuthMethod{pubkey},
+		Timeout:         sshConnectionTimeout,
 	}
 	return &sshConfig, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ const (`
`76`	`76`	`retryableDeleteOperationTimeout = 3 * time.Minute`
`77`	`77`	`retryableOperationSleepBetweenRetries = 3 * time.Second`
`78`	`78`	`helmInstallTimeout = 3 * time.Minute`
	`79`	`+ sshConnectionTimeout = 30 * time.Second`
`79`	`80`	`)`
`80`	`81`
`81`	`82`	`// deploymentsClientAdapter adapts a Deployment to work with WaitForDeploymentsAvailable.`
`@@ -591,6 +592,7 @@ func newSSHConfig() (*ssh.ClientConfig, error) {`
`591`	`592`	`HostKeyCallback: ssh.InsecureIgnoreHostKey(), //nolint:gosec // Non-production code`
`592`	`593`	`User: azure.DefaultUserName,`
`593`	`594`	`Auth: []ssh.AuthMethod{pubkey},`
	`595`	`+ Timeout: sshConnectionTimeout,`
`594`	`596`	`}`
`595`	`597`	`return &sshConfig, nil`
`596`	`598`	`}`