diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | .travis/kubernetes/00_run_k8s.sh (renamed from contrib/kubernetes/testscripts/00_run_k8s.sh) | 0 | ||||
| -rwxr-xr-x | .travis/kubernetes/10_setup_kubectl.sh (renamed from contrib/kubernetes/testscripts/10_setup_kubectl.sh) | 0 | ||||
| -rwxr-xr-x | .travis/kubernetes/15_run_skydns.sh (renamed from contrib/kubernetes/testscripts/15_run_skydns.sh) | 0 | ||||
| -rwxr-xr-x | .travis/kubernetes/20_setup_k8s_services.sh (renamed from contrib/kubernetes/testscripts/20_setup_k8s_services.sh) | 0 | ||||
| -rw-r--r-- | .travis/kubernetes/README.md (renamed from contrib/kubernetes/testscripts/README.md) | 0 | ||||
| -rwxr-xr-x | .travis/kubernetes/kill_all_containers.sh (renamed from contrib/kubernetes/testscripts/kill_all_containers.sh) | 0 | ||||
| -rw-r--r-- | .travis/kubernetes/kubernetes-rc.yaml (renamed from contrib/kubernetes/kubernetes-rc.yaml) | 0 | ||||
| -rw-r--r-- | .travis/kubernetes/nginx-rc.yml (renamed from contrib/kubernetes/testscripts/nginx-rc.yml) | 0 | ||||
| -rwxr-xr-x | .travis/kubernetes/start_k8s_with_services.sh (renamed from contrib/kubernetes/testscripts/start_k8s_with_services.sh) | 0 |
10 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 0d81fe981..e5b56a196 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,11 +30,11 @@ before_install: before_script: - docker run -d --net=host --name=etcd quay.io/coreos/etcd:v$ETCD_VERSION - - ./contrib/kubernetes/testscripts/start_k8s_with_services.sh + - ./.travis/kubernetes/start_k8s_with_services.sh script: - docker ps -a - - ./contrib/kubernetes/testscripts/kubectl version + - ./.travis/kubernetes/kubectl version - make coverage after_success: diff --git a/contrib/kubernetes/testscripts/00_run_k8s.sh b/.travis/kubernetes/00_run_k8s.sh index 094f7d5d0..094f7d5d0 100755 --- a/contrib/kubernetes/testscripts/00_run_k8s.sh +++ b/.travis/kubernetes/00_run_k8s.sh diff --git a/contrib/kubernetes/testscripts/10_setup_kubectl.sh b/.travis/kubernetes/10_setup_kubectl.sh index a7cfc1e76..a7cfc1e76 100755 --- a/contrib/kubernetes/testscripts/10_setup_kubectl.sh +++ b/.travis/kubernetes/10_setup_kubectl.sh diff --git a/contrib/kubernetes/testscripts/15_run_skydns.sh b/.travis/kubernetes/15_run_skydns.sh index 266d83dcc..266d83dcc 100755 --- a/contrib/kubernetes/testscripts/15_run_skydns.sh +++ b/.travis/kubernetes/15_run_skydns.sh diff --git a/contrib/kubernetes/testscripts/20_setup_k8s_services.sh b/.travis/kubernetes/20_setup_k8s_services.sh index b2f45008d..b2f45008d 100755 --- a/contrib/kubernetes/testscripts/20_setup_k8s_services.sh +++ b/.travis/kubernetes/20_setup_k8s_services.sh diff --git a/contrib/kubernetes/testscripts/README.md b/.travis/kubernetes/README.md index 9642b42a8..9642b42a8 100644 --- a/contrib/kubernetes/testscripts/README.md +++ b/.travis/kubernetes/README.md diff --git a/contrib/kubernetes/testscripts/kill_all_containers.sh b/.travis/kubernetes/kill_all_containers.sh index aa7f4255d..aa7f4255d 100755 --- a/contrib/kubernetes/testscripts/kill_all_containers.sh +++ b/.travis/kubernetes/kill_all_containers.sh diff --git a/contrib/kubernetes/kubernetes-rc.yaml b/.travis/kubernetes/kubernetes-rc.yaml index 87d29418c..87d29418c 100644 --- a/contrib/kubernetes/kubernetes-rc.yaml +++ b/.travis/kubernetes/kubernetes-rc.yaml diff --git a/contrib/kubernetes/testscripts/nginx-rc.yml b/.travis/kubernetes/nginx-rc.yml index 4597de409..4597de409 100644 --- a/contrib/kubernetes/testscripts/nginx-rc.yml +++ b/.travis/kubernetes/nginx-rc.yml diff --git a/contrib/kubernetes/testscripts/start_k8s_with_services.sh b/.travis/kubernetes/start_k8s_with_services.sh index 40db49715..40db49715 100755 --- a/contrib/kubernetes/testscripts/start_k8s_with_services.sh +++ b/.travis/kubernetes/start_k8s_with_services.sh |