From ea98429512c3f3fc130bfc99227bd8715ab27f07 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Wed, 5 Oct 2016 16:17:52 +0100 Subject: [PATCH] kubernetes: hide contrib (#320) This is purely travis (and maybe local testing). Does not warrent (IMHO) a contrib/ directory. Hide it in a .travis directory. --- .travis.yml | 4 ++-- .../testscripts => .travis/kubernetes}/00_run_k8s.sh | 0 .../testscripts => .travis/kubernetes}/10_setup_kubectl.sh | 0 .../testscripts => .travis/kubernetes}/15_run_skydns.sh | 0 .../kubernetes}/20_setup_k8s_services.sh | 0 .../kubernetes/testscripts => .travis/kubernetes}/README.md | 0 .../testscripts => .travis/kubernetes}/kill_all_containers.sh | 0 {contrib => .travis}/kubernetes/kubernetes-rc.yaml | 0 .../testscripts => .travis/kubernetes}/nginx-rc.yml | 0 .../kubernetes}/start_k8s_with_services.sh | 0 10 files changed, 2 insertions(+), 2 deletions(-) rename {contrib/kubernetes/testscripts => .travis/kubernetes}/00_run_k8s.sh (100%) rename {contrib/kubernetes/testscripts => .travis/kubernetes}/10_setup_kubectl.sh (100%) rename {contrib/kubernetes/testscripts => .travis/kubernetes}/15_run_skydns.sh (100%) rename {contrib/kubernetes/testscripts => .travis/kubernetes}/20_setup_k8s_services.sh (100%) rename {contrib/kubernetes/testscripts => .travis/kubernetes}/README.md (100%) rename {contrib/kubernetes/testscripts => .travis/kubernetes}/kill_all_containers.sh (100%) rename {contrib => .travis}/kubernetes/kubernetes-rc.yaml (100%) rename {contrib/kubernetes/testscripts => .travis/kubernetes}/nginx-rc.yml (100%) rename {contrib/kubernetes/testscripts => .travis/kubernetes}/start_k8s_with_services.sh (100%) 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 similarity index 100% rename from contrib/kubernetes/testscripts/00_run_k8s.sh rename to .travis/kubernetes/00_run_k8s.sh diff --git a/contrib/kubernetes/testscripts/10_setup_kubectl.sh b/.travis/kubernetes/10_setup_kubectl.sh similarity index 100% rename from contrib/kubernetes/testscripts/10_setup_kubectl.sh rename to .travis/kubernetes/10_setup_kubectl.sh diff --git a/contrib/kubernetes/testscripts/15_run_skydns.sh b/.travis/kubernetes/15_run_skydns.sh similarity index 100% rename from contrib/kubernetes/testscripts/15_run_skydns.sh rename to .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 similarity index 100% rename from contrib/kubernetes/testscripts/20_setup_k8s_services.sh rename to .travis/kubernetes/20_setup_k8s_services.sh diff --git a/contrib/kubernetes/testscripts/README.md b/.travis/kubernetes/README.md similarity index 100% rename from contrib/kubernetes/testscripts/README.md rename to .travis/kubernetes/README.md diff --git a/contrib/kubernetes/testscripts/kill_all_containers.sh b/.travis/kubernetes/kill_all_containers.sh similarity index 100% rename from contrib/kubernetes/testscripts/kill_all_containers.sh rename to .travis/kubernetes/kill_all_containers.sh diff --git a/contrib/kubernetes/kubernetes-rc.yaml b/.travis/kubernetes/kubernetes-rc.yaml similarity index 100% rename from contrib/kubernetes/kubernetes-rc.yaml rename to .travis/kubernetes/kubernetes-rc.yaml diff --git a/contrib/kubernetes/testscripts/nginx-rc.yml b/.travis/kubernetes/nginx-rc.yml similarity index 100% rename from contrib/kubernetes/testscripts/nginx-rc.yml rename to .travis/kubernetes/nginx-rc.yml diff --git a/contrib/kubernetes/testscripts/start_k8s_with_services.sh b/.travis/kubernetes/start_k8s_with_services.sh similarity index 100% rename from contrib/kubernetes/testscripts/start_k8s_with_services.sh rename to .travis/kubernetes/start_k8s_with_services.sh