kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #751 from bogdando/rebalance_gce 

Rebalance CI GCE zones for better CPU per region usage
pull/742/head
Antoine Legrand 2016-12-14 16:27:27 +01:00 committed by GitHub
parent 29874baf8a 1551fe01f9
commit 77ebf4531c
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.travis.yml
View File

@ -23,44 +23,44 @@ env:
- >- - >-
KUBE_NETWORK_PLUGIN=canal KUBE_NETWORK_PLUGIN=canal
CLOUD_IMAGE=debian-8-kubespray CLOUD_IMAGE=debian-8-kubespray
CLOUD_REGION=europe-west1-d CLOUD_REGION=asia-east1-a
CLUSTER_MODE=default CLUSTER_MODE=default
- >- - >-
KUBE_NETWORK_PLUGIN=calico KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=debian-8-kubespray CLOUD_IMAGE=debian-8-kubespray
CLOUD_REGION=us-central1-b CLOUD_REGION=asia-northeast1-b
CLUSTER_MODE=default CLUSTER_MODE=default
# Centos 7 # Centos 7
- >- - >-
KUBE_NETWORK_PLUGIN=flannel KUBE_NETWORK_PLUGIN=flannel
CLOUD_IMAGE=centos-7 CLOUD_IMAGE=centos-7
CLOUD_REGION=europe-west1-d CLOUD_REGION=europe-west1-c
CLUSTER_MODE=default CLUSTER_MODE=default
- >- - >-
KUBE_NETWORK_PLUGIN=calico KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=centos-7 CLOUD_IMAGE=centos-7
CLOUD_REGION=europe-west1-b CLOUD_REGION=us-central1-b
CLUSTER_MODE=default CLUSTER_MODE=default
# Redhat 7 # Redhat 7
- >- - >-
KUBE_NETWORK_PLUGIN=weave KUBE_NETWORK_PLUGIN=weave
CLOUD_IMAGE=rhel-7 CLOUD_IMAGE=rhel-7
CLOUD_REGION=europe-west1-b CLOUD_REGION=us-east1-c
CLUSTER_MODE=default CLUSTER_MODE=default
# CoreOS stable # CoreOS stable
#- >- #- >-
# KUBE_NETWORK_PLUGIN=weave # KUBE_NETWORK_PLUGIN=weave
# CLOUD_IMAGE=coreos-stable # CLOUD_IMAGE=coreos-stable
# CLOUD_REGION=europe-west1-a # CLOUD_REGION=europe-west1-b
# CLUSTER_MODE=default # CLUSTER_MODE=default
# BOOTSTRAP_OS=coreos # BOOTSTRAP_OS=coreos
- >- - >-
KUBE_NETWORK_PLUGIN=canal KUBE_NETWORK_PLUGIN=canal
CLOUD_IMAGE=coreos-stable CLOUD_IMAGE=coreos-stable
CLOUD_REGION=us-east1-d CLOUD_REGION=us-west1-b
CLUSTER_MODE=default CLUSTER_MODE=default
BOOTSTRAP_OS=coreos BOOTSTRAP_OS=coreos
@ -73,7 +73,7 @@ env:
- >- - >-
KUBE_NETWORK_PLUGIN=weave KUBE_NETWORK_PLUGIN=weave
CLOUD_IMAGE=ubuntu-1604-xenial CLOUD_IMAGE=ubuntu-1604-xenial
CLOUD_REGION=us-west1-b CLOUD_REGION=europe-west1-d
CLUSTER_MODE=separate CLUSTER_MODE=separate
- >- - >-
KUBE_NETWORK_PLUGIN=calico KUBE_NETWORK_PLUGIN=calico
@ -84,7 +84,7 @@ env:
matrix: matrix:
allow_failures: allow_failures:
- env: KUBE_NETWORK_PLUGIN=weave CLOUD_IMAGE=coreos-stable CLOUD_REGION=europe-west1-a CLUSTER_MODE=default BOOTSTRAP_OS=coreos - env: KUBE_NETWORK_PLUGIN=weave CLOUD_IMAGE=coreos-stable CLOUD_REGION=europe-west1-b CLUSTER_MODE=default BOOTSTRAP_OS=coreos
before_install: before_install:
# Install Ansible. # Install Ansible.

14
docs/test_cases.md
View File

@ -8,14 +8,14 @@ Here is the test matrix for the Travis CI gates:
| Network plugin| OS type| GCE region| Nodes layout| | Network plugin| OS type| GCE region| Nodes layout|
|-------------------------|-------------------------|-------------------------|-------------------------| |-------------------------|-------------------------|-------------------------|-------------------------|
| canal| debian-8| europe-west1-d| default| | canal| debian-8-kubespray| asia-east1-a| default|
| calico| debian-8| us-central1-b| default| | calico| debian-8-kubespray| asia-northeast1-b| default|
| flannel| centos-7| europe-west1-d| default| | flannel| centos-7| europe-west1-c| default|
| calico| centos-7| europe-west1-b| default| | calico| centos-7| us-central1-b| default|
| weave| rhel-7| europe-west1-b| default| | weave| rhel-7| us-east1-c| default|
| canal| coreos-stable| us-east1-d| default| | canal| coreos-stable| us-west1-b| default|
| canal| rhel-7| europe-west1-c| separate| | canal| rhel-7| europe-west1-c| separate|
| weave| ubuntu-1604-xenial| us-west1-b| separate| | weave| ubuntu-1604-xenial| europe-west1-d| separate|
| calico| coreos-stable| us-central1-f| separate| | calico| coreos-stable| us-central1-f| separate|
Where the nodes layout `default` is that is given in the example inventory file. Where the nodes layout `default` is that is given in the example inventory file.