github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and

Browse Source 
MASTER_OS_DISTRIBUTION.
This commit is contained in:
Maisem Ali
2016-06-23 11:22:04 -07:00
parent bea382c124
commit 97f3f80833
23 changed files with 334 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/framework/test_context.go
View File

@@ -46,8 +46,9 @@ type TestContextType struct {
SystemPodsStartupTimeout time.Duration
UpgradeTarget string
PrometheusPushGateway string
OSDistro string
ContainerRuntime string
MasterOSDistro string
NodeOSDistro string
VerifyServiceAccount bool
DeleteNamespace bool
CleanStart bool
@@ -124,8 +125,9 @@ func RegisterClusterFlags() {
flag.StringVar(&TestContext.ReportDir, "report-dir", "", "Path to the directory where the JUnit XML reports should be saved. Default is empty, which doesn't generate these reports.")
flag.StringVar(&TestContext.ReportPrefix, "report-prefix", "", "Optional prefix for JUnit XML reports. Default is empty, which doesn't prepend anything to the default name.")
flag.StringVar(&TestContext.Prefix, "prefix", "e2e", "A prefix to be added to cloud resources created during testing.")
flag.StringVar(&TestContext.OSDistro, "os-distro", "debian", "The OS distribution of cluster VM instances (debian, trusty, or coreos).")
flag.StringVar(&TestContext.ContainerRuntime, "container-runtime", "docker", "The container runtime of cluster VM instances (docker or rkt).")
flag.StringVar(&TestContext.MasterOSDistro, "master-os-distro", "debian", "The OS distribution of cluster master (debian, trusty, or coreos).")
flag.StringVar(&TestContext.NodeOSDistro, "node-os-distro", "debian", "The OS distribution of cluster VM instances (debian, trusty, or coreos).")
// TODO: Flags per provider? Rename gce-project/gce-zone?
cloudConfig := &TestContext.CloudConfig