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

Add weave to tests

pull/138/head
ant31 2016-02-10 23:02:12 +01:00
parent caa2555b1d
commit 4ee3699933
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
.travis.yml
View File

@ -21,6 +21,10 @@ env:
KUBE_NETWORK_PLUGIN=calico KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=debian-8 CLOUD_IMAGE=debian-8
CLOUD_REGION=europe-west1-b CLOUD_REGION=europe-west1-b
- >-
KUBE_NETWORK_PLUGIN=weave
CLOUD_IMAGE=debian-8
CLOUD_REGION=europe-west1-b
# Centos 7 # Centos 7
- >- - >-
@ -35,11 +39,11 @@ env:
# # Redhat 7 # # Redhat 7
# - >- - >-
# KUBE_NETWORK_PLUGIN=flannel KUBE_NETWORK_PLUGIN=flannel
# CLOUD_IMAGE=rhel-7-sudo CLOUD_IMAGE=rhel-7-sudo
# CLOUD_REGION=us-east1-d CLOUD_REGION=us-east1-d
# SSH_ARGS='--ssh-extra-args="-t"'
# - >- # - >-
# KUBE_NETWORK_PLUGIN=calico # KUBE_NETWORK_PLUGIN=calico
# CLOUD_IMAGE=rhel-7-sudo # CLOUD_IMAGE=rhel-7-sudo
@ -54,21 +58,31 @@ env:
KUBE_NETWORK_PLUGIN=calico KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=ubuntu-1404-trusty CLOUD_IMAGE=ubuntu-1404-trusty
CLOUD_REGION=europe-west1-c CLOUD_REGION=europe-west1-c
- >-
KUBE_NETWORK_PLUGIN=weave
CLOUD_IMAGE=ubuntu-1404-trusty
CLOUD_REGION=europe-west1-c
# Ubuntu 15.10 # # Ubuntu 15.10
- >- # - >-
KUBE_NETWORK_PLUGIN=flannel # KUBE_NETWORK_PLUGIN=flannel
CLOUD_IMAGE=ubuntu-1510-wily # CLOUD_IMAGE=ubuntu-1510-wily
CLOUD_REGION=us-central1-a # CLOUD_REGION=us-central1-a
- >- # - >-
KUBE_NETWORK_PLUGIN=calico # KUBE_NETWORK_PLUGIN=calico
CLOUD_IMAGE=ubuntu-1510-wily # CLOUD_IMAGE=ubuntu-1510-wily
CLOUD_REGION=us-central1-a # CLOUD_REGION=us-central1-a
# - >-
# KUBE_NETWORK_PLUGIN=weave
# CLOUD_IMAGE=ubuntu-1510-wily
# CLOUD_REGION=us-central1-a
matrix: matrix:
allow_failures: allow_failures:
- env: KUBE_NETWORK_PLUGIN=flannel CLOUD_IMAGE=centos-7-sudo CLOUD_REGION=us-central1-c - 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
before_install: before_install:
# Install Ansible. # Install Ansible.

2
roles/apps/k8s-kube-logstash

@ -1 +1 @@
Subproject commit c1c0ce8e27b430cff8e5b0f1519707eb892f5e67 Subproject commit 71c7bf98210e8907554a26e25cc9c2a3ece8cffd