From 50f77cca1d011e75c5b330cca3114ce54c13f502 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobrelia@mirantis.com>
Date: Fri, 28 Oct 2016 14:56:48 +0200
Subject: [PATCH] Add CI test layouts
* Drop Wily from test matrix
* Replace the Wily cases dropped with extra cases to test separate
roles deployment
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
---
.travis.yml | 34 ++++++++++++++++++++--------
tests/cloud_playbooks/create-gce.yml | 2 +-
tests/cloud_playbooks/delete-gce.yml | 2 +-
tests/templates/inventory-gce.j2 | 11 +++++++++
4 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 13604765e..863374c26 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,80 +11,92 @@ env:
CONTAINER_ENGINE=docker
PRIVATE_KEY=$GCE_PRIVATE_KEY
ANSIBLE_KEEP_REMOTE_FILES=1
+ CLUSTER_MODE=default
matrix:
# Debian Jessie
- >-
KUBE_NETWORK_PLUGIN=flannel
CLOUD_IMAGE=debian-8-kubespray
CLOUD_REGION=europe-west1-b
+ CLUSTER_MODE=default
- >-
KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=debian-8-kubespray
CLOUD_REGION=us-central1-c
+ CLUSTER_MODE=default
- >-
KUBE_NETWORK_PLUGIN=weave
CLOUD_IMAGE=debian-8-kubespray
CLOUD_REGION=us-east1-d
+ CLUSTER_MODE=default
# Centos 7
- >-
KUBE_NETWORK_PLUGIN=flannel
CLOUD_IMAGE=centos-7-sudo
CLOUD_REGION=asia-east1-c
-
+ CLUSTER_MODE=default
- >-
KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=centos-7-sudo
CLOUD_REGION=europe-west1-b
-
+ CLUSTER_MODE=default
- >-
KUBE_NETWORK_PLUGIN=weave
CLOUD_IMAGE=centos-7-sudo
CLOUD_REGION=us-central1-c
+ CLUSTER_MODE=default
# Redhat 7
- >-
KUBE_NETWORK_PLUGIN=flannel
CLOUD_IMAGE=rhel-7-sudo
CLOUD_REGION=us-east1-d
-
+ CLUSTER_MODE=default
- >-
KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=rhel-7-sudo
CLOUD_REGION=asia-east1-c
-
+ CLUSTER_MODE=default
- >-
KUBE_NETWORK_PLUGIN=weave
CLOUD_IMAGE=rhel-7-sudo
CLOUD_REGION=europe-west1-b
+ CLUSTER_MODE=default
# Ubuntu 16.04
- >-
KUBE_NETWORK_PLUGIN=flannel
CLOUD_IMAGE=ubuntu-1604-xenial
CLOUD_REGION=us-central1-c
+ CLUSTER_MODE=default
- >-
KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=ubuntu-1604-xenial
CLOUD_REGION=us-east1-d
+ CLUSTER_MODE=default
- >-
KUBE_NETWORK_PLUGIN=weave
CLOUD_IMAGE=ubuntu-1604-xenial
CLOUD_REGION=asia-east1-c
+ CLUSTER_MODE=default
- # Ubuntu 15.10
+ # Extra cases for separated roles
- >-
KUBE_NETWORK_PLUGIN=flannel
- CLOUD_IMAGE=ubuntu-1510-wily
+ CLOUD_IMAGE=rhel-7-sudo
CLOUD_REGION=europe-west1-b
+ CLUSTER_MODE=separate
- >-
KUBE_NETWORK_PLUGIN=calico
- CLOUD_IMAGE=ubuntu-1510-wily
+ CLOUD_IMAGE=ubuntu-1604-xenial
CLOUD_REGION=us-central1-a
+ CLUSTER_MODE=separate
- >-
KUBE_NETWORK_PLUGIN=weave
- CLOUD_IMAGE=ubuntu-1510-wily
+ CLOUD_IMAGE=debian-8-kubespray
CLOUD_REGION=us-east1-d
+ CLUSTER_MODE=separate
before_install:
@@ -92,7 +104,8 @@ before_install:
- pip install --user boto -U
- pip install --user ansible
- pip install --user netaddr
- - pip install --user apache-libcloud
+ # W/A https://github.com/ansible/ansible-modules-core/issues/5196#issuecomment-253766186
+ - pip install --user apache-libcloud==0.20.1
cache:
- directories:
@@ -114,7 +127,8 @@ before_script:
script:
- >
- $HOME/.local/bin/ansible-playbook tests/cloud_playbooks/create-gce.yml -i tests/local_inventory/hosts -c local $LOG_LEVEL
+ $HOME/.local/bin/ansible-playbook tests/cloud_playbooks/create-gce.yml -i tests/local_inventory/hosts.cfg -c local $LOG_LEVEL
+ -e mode=${CLUSTER_MODE}
-e test_id=${TEST_ID}
-e kube_network_plugin=${KUBE_NETWORK_PLUGIN}
-e gce_project_id=${GCE_PROJECT_ID}
diff --git a/tests/cloud_playbooks/create-gce.yml b/tests/cloud_playbooks/create-gce.yml
index 840cf2e7c..b2c3e3020 100644
--- a/tests/cloud_playbooks/create-gce.yml
+++ b/tests/cloud_playbooks/create-gce.yml
@@ -1,6 +1,6 @@
---
- hosts: localhost
- sudo: False
+ become: false
gather_facts: no
vars:
cloud_machine_type: g1-small
diff --git a/tests/cloud_playbooks/delete-gce.yml b/tests/cloud_playbooks/delete-gce.yml
index d42c6cc91..54902fb6f 100644
--- a/tests/cloud_playbooks/delete-gce.yml
+++ b/tests/cloud_playbooks/delete-gce.yml
@@ -1,6 +1,6 @@
---
- hosts: localhost
- sudo: False
+ become: false
gather_facts: no
vars:
cloud_machine_type: f1-micro
diff --git a/tests/templates/inventory-gce.j2 b/tests/templates/inventory-gce.j2
index 72ad469de..418910771 100644
--- a/tests/templates/inventory-gce.j2
+++ b/tests/templates/inventory-gce.j2
@@ -2,6 +2,16 @@ node1 ansible_ssh_host={{gce.instance_data[0].public_ip}}
node2 ansible_ssh_host={{gce.instance_data[1].public_ip}}
node3 ansible_ssh_host={{gce.instance_data[2].public_ip}}
+{% if mode is defined and mode == "separate" %}
+[kube-master]
+node1
+
+[kube-node]
+node2
+
+[etcd]
+node3
+{% else %}
[kube-master]
node1
node2
@@ -14,6 +24,7 @@ node3
[etcd]
node1
node2
+{% endif %}
[k8s-cluster:children]
kube-node
--
GitLab