From 1551fe01f90b21215c4ae957a23e1222d80d62ac Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobrelia@mirantis.com>
Date: Wed, 14 Dec 2016 16:23:57 +0100
Subject: [PATCH] Rebalance CI GCE zones for better CPU per region usage
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
---
.travis.yml | 18 +++++++++---------
docs/test_cases.md | 14 +++++++-------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index daec83cb2..11e6bc881 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,44 +23,44 @@ env:
- >-
KUBE_NETWORK_PLUGIN=canal
CLOUD_IMAGE=debian-8-kubespray
- CLOUD_REGION=europe-west1-d
+ CLOUD_REGION=asia-east1-a
CLUSTER_MODE=default
- >-
KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=debian-8-kubespray
- CLOUD_REGION=us-central1-b
+ CLOUD_REGION=asia-northeast1-b
CLUSTER_MODE=default
# Centos 7
- >-
KUBE_NETWORK_PLUGIN=flannel
CLOUD_IMAGE=centos-7
- CLOUD_REGION=europe-west1-d
+ CLOUD_REGION=europe-west1-c
CLUSTER_MODE=default
- >-
KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=centos-7
- CLOUD_REGION=europe-west1-b
+ CLOUD_REGION=us-central1-b
CLUSTER_MODE=default
# Redhat 7
- >-
KUBE_NETWORK_PLUGIN=weave
CLOUD_IMAGE=rhel-7
- CLOUD_REGION=europe-west1-b
+ CLOUD_REGION=us-east1-c
CLUSTER_MODE=default
# CoreOS stable
#- >-
# KUBE_NETWORK_PLUGIN=weave
# CLOUD_IMAGE=coreos-stable
- # CLOUD_REGION=europe-west1-a
+ # CLOUD_REGION=europe-west1-b
# CLUSTER_MODE=default
# BOOTSTRAP_OS=coreos
- >-
KUBE_NETWORK_PLUGIN=canal
CLOUD_IMAGE=coreos-stable
- CLOUD_REGION=us-east1-d
+ CLOUD_REGION=us-west1-b
CLUSTER_MODE=default
BOOTSTRAP_OS=coreos
@@ -73,7 +73,7 @@ env:
- >-
KUBE_NETWORK_PLUGIN=weave
CLOUD_IMAGE=ubuntu-1604-xenial
- CLOUD_REGION=us-west1-b
+ CLOUD_REGION=europe-west1-d
CLUSTER_MODE=separate
- >-
KUBE_NETWORK_PLUGIN=calico
@@ -84,7 +84,7 @@ env:
matrix:
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:
# Install Ansible.
diff --git a/docs/test_cases.md b/docs/test_cases.md
index 72999e68a..74c6d2bc8 100644
--- a/docs/test_cases.md
+++ b/docs/test_cases.md
@@ -8,14 +8,14 @@ Here is the test matrix for the Travis CI gates:
| Network plugin| OS type| GCE region| Nodes layout|
|-------------------------|-------------------------|-------------------------|-------------------------|
-| canal| debian-8| europe-west1-d| default|
-| calico| debian-8| us-central1-b| default|
-| flannel| centos-7| europe-west1-d| default|
-| calico| centos-7| europe-west1-b| default|
-| weave| rhel-7| europe-west1-b| default|
-| canal| coreos-stable| us-east1-d| default|
+| canal| debian-8-kubespray| asia-east1-a| default|
+| calico| debian-8-kubespray| asia-northeast1-b| default|
+| flannel| centos-7| europe-west1-c| default|
+| calico| centos-7| us-central1-b| default|
+| weave| rhel-7| us-east1-c| default|
+| canal| coreos-stable| us-west1-b| default|
| 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|
Where the nodes layout `default` is that is given in the example inventory file.
--
GitLab