Pass the GCE project, zone, and master name into e2e.go as flags.

This commit is contained in:
Alex Robinson
2015-02-18 15:12:20 -08:00
parent f946aa887b
commit 94161a44ee
5 changed files with 29 additions and 31 deletions

View File

@@ -31,6 +31,12 @@ import (
type testResult bool
type GCEConfig struct {
ProjectID string
Zone string
MasterName string
}
func init() {
// Turn on verbose by default to get spec names
config.DefaultReporterConfig.Verbose = true
@@ -46,8 +52,8 @@ func (t *testResult) Fail() { *t = false }
// Run each Go end-to-end-test. This function assumes the
// creation of a test cluster.
func RunE2ETests(authConfig, certDir, host, repoRoot, provider string, orderseed int64, times int, reportDir string, testList []string) {
testContext = testContextType{authConfig, certDir, host, repoRoot, provider}
func RunE2ETests(authConfig, certDir, host, repoRoot, provider string, gceConfig *GCEConfig, orderseed int64, times int, reportDir string, testList []string) {
testContext = testContextType{authConfig, certDir, host, repoRoot, provider, *gceConfig}
util.ReallyCrash = true
util.InitLogs()
defer util.FlushLogs()