Merge pull request #1111 from pwittrock/pre-integration-test-use-direct-ssh

Add ssh-options flag so pr builder can test #1108
This commit is contained in:
Vish Kannan 2016-02-11 14:53:54 -08:00
commit 94cef953b1

View File

@ -45,6 +45,7 @@ var cadvisorTimeout = flag.Duration("cadvisor_timeout", 15*time.Second, "Time to
var port = flag.Int("port", 8080, "Port in which to start cAdvisor in the remote host")
var testRetryCount = flag.Int("test-retry-count", 3, "Number of times to retry failed tests before failing.")
var testRetryWhitelist = flag.String("test-retry-whitelist", "", "Path to newline separated list of regexexp for test failures that should be retried. If empty, no tests are retried.")
var sshOptions = flag.String("ssh-options", "", "Commandline options passed to ssh.") // Used in a follow up
var retryRegex *regexp.Regexp
func getAttributes(ipAddress, portStr string) (*cadvisorApi.Attributes, error) {