diff --git a/.travis.yml b/.travis.yml index b06e14921..a54ead427 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,22 +32,31 @@ env: CLOUD_IMAGE=centos-7-sudo CLOUD_REGION=us-central1-c - # - >- - # KUBE_NETWORK_PLUGIN=calico - # CLOUD_IMAGE=centos-7-sudo - # CLOUD_REGION=us-central1-c + - >- + KUBE_NETWORK_PLUGIN=calico + CLOUD_IMAGE=centos-7-sudo + CLOUD_REGION=us-central1-c + - >- + KUBE_NETWORK_PLUGIN=weave + CLOUD_IMAGE=centos-7-sudo + CLOUD_REGION=us-central1-c - # # Redhat 7 + # Redhat 7 - >- KUBE_NETWORK_PLUGIN=flannel CLOUD_IMAGE=rhel-7-sudo CLOUD_REGION=us-east1-d - # - >- - # KUBE_NETWORK_PLUGIN=calico - # CLOUD_IMAGE=rhel-7-sudo - # CLOUD_REGION=us-east1-d + - >- + KUBE_NETWORK_PLUGIN=calico + CLOUD_IMAGE=rhel-7-sudo + CLOUD_REGION=us-east1-d + + - >- + KUBE_NETWORK_PLUGIN=weave + CLOUD_IMAGE=rhel-7-sudo + CLOUD_REGION=us-east1-d # Ubuntu 14.04 - >- @@ -80,10 +89,10 @@ env: matrix: allow_failures: - - env: KUBE_NETWORK_PLUGIN=flannel CLOUD_IMAGE=centos-7-sudo CLOUD_REGION=us-central1-c - - env: KUBE_NETWORK_PLUGIN=flannel CLOUD_IMAGE=rhel-7-sudo CLOUD_REGION=us-east1-d +# - env: KUBE_NETWORK_PLUGIN=flannel CLOUD_IMAGE=centos-7-sudo CLOUD_REGION=us-central1-c +# - env: KUBE_NETWORK_PLUGIN=flannel CLOUD_IMAGE=rhel-7-sudo CLOUD_REGION=us-east1-d - env: KUBE_NETWORK_PLUGIN=weave CLOUD_IMAGE=ubuntu-1404-trusty CLOUD_REGION=europe-west1-c - - env: KUBE_NETWORK_PLUGIN=calico CLOUD_IMAGE=ubuntu-1404-trusty CLOUD_REGION=europe-west1-c +# - env: KUBE_NETWORK_PLUGIN=calico CLOUD_IMAGE=ubuntu-1404-trusty CLOUD_REGION=europe-west1-c before_install: # Install Ansible. @@ -128,7 +137,7 @@ script: ## Create a POD - $HOME/.local/bin/ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS -b --become-user=root tests/testcases/020_check-create-pod.yml $LOG_LEVEL ## Ping the between 2 pod - - $HOME/.local/bin/ansible-playbook -i setup-kubernetes/inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS -b --become-user=root tests/testcases/030_check-network.yml $LOG_LEVEL + - $HOME/.local/bin/ansible-playbook -i inventory/inventory.ini -u $SSH_USER -e ansible_ssh_user=$SSH_USER $SSH_ARGS -b --become-user=root tests/testcases/030_check-network.yml $LOG_LEVEL after_script: - > diff --git a/README.md b/README.md index 38a07805c..4179c7068 100644 --- a/README.md +++ b/README.md @@ -23,12 +23,12 @@ in order to avoid any issue during deployment you should disable your firewall * Base knowledge on Ansible. Please refer to [Ansible documentation](http://www.ansible.com/how-ansible-works) ### Components -* [kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.1.7 +* [kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.1.4 * [etcd](https://github.com/coreos/etcd/releases) v2.2.4 * [calicoctl](https://github.com/projectcalico/calico-docker/releases) v0.16.0 * [flanneld](https://github.com/coreos/flannel/releases) v0.5.5 * [weave](http://weave.works/) v1.4.4 -* [docker](https://www.docker.com/) v1.9.1 +* [docker](https://www.docker.com/) v1.9 Quickstart ------------------------- diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 685bc57cd..3caecf3af 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -1 +1 @@ -docker_version: 1.10 +docker_version: 1.9 diff --git a/tests/scripts/ansibl8s_test.sh b/tests/scripts/ansibl8s_test.sh index 53f8f2d7d..1f0c889df 100644 --- a/tests/scripts/ansibl8s_test.sh +++ b/tests/scripts/ansibl8s_test.sh @@ -34,19 +34,19 @@ should_deploy_cluster() { } should_api_server_respond() { - ansible-playbook -i inventory.ini ${private_key} testcases/check-apiserver.yml + ansible-playbook -i inventory.ini ${private_key} testcases/010_check-apiserver.yml assertion__status_code_is_success $? } should_create_pod() { - ansible-playbook -i inventory.ini -s ${private_key} testcases/check-create-pod.yml -vv + ansible-playbook -i inventory.ini -s ${private_key} testcases/020_check-create-pod.yml -vv assertion__status_code_is_success $? } should_pod_be_in_expected_subnet() { - ansible-playbook -i inventory.ini -s ${private_key} testcases/check-network.yml -vv + ansible-playbook -i inventory.ini -s ${private_key} testcases/030_check-network.yml -vv assertion__status_code_is_success $? }