From fa40ced8f81cd9770e6457337ed585d2b363d7ab Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Thu, 13 Aug 2015 22:43:57 -0700 Subject: [PATCH] move contrib/for-tests to test/images --- hack/lib/golang.sh | 4 ++-- hack/verify-flags/exceptions.txt | 8 ++++++++ test/e2e/volumes.go | 14 +++++++------- .../for-tests => test/images}/dnsutils/Dockerfile | 0 .../for-tests => test/images}/dnsutils/Makefile | 0 .../images}/entrypoint-tester/Dockerfile | 0 .../images}/entrypoint-tester/Makefile | 0 .../images}/entrypoint-tester/ep.go | 0 .../images}/jessie-dnsutils/Dockerfile | 0 .../images}/jessie-dnsutils/Makefile | 0 .../images}/mount-tester-user/Dockerfile | 0 .../images}/mount-tester-user/Makefile | 0 .../images}/mount-tester/Dockerfile | 0 .../images}/mount-tester/Makefile | 0 .../for-tests => test/images}/mount-tester/mt.go | 0 .../images}/network-tester/Dockerfile | 0 .../images}/network-tester/Makefile | 0 .../images}/network-tester/rc.json | 0 .../images}/network-tester/service.json | 0 .../images}/network-tester/webserver.go | 0 .../for-tests => test/images}/porter/.gitignore | 0 .../for-tests => test/images}/porter/Dockerfile | 0 .../for-tests => test/images}/porter/Makefile | 0 .../for-tests => test/images}/porter/README.md | 2 +- .../for-tests => test/images}/porter/pod.json | 0 .../for-tests => test/images}/porter/porter.go | 0 .../images}/resource-consumer/Dockerfile | 0 .../images}/resource-consumer/Makefile | 0 .../resource-consumer/consume-cpu/consume_cpu.go | 0 .../resource-consumer/resource_consumer.go | 0 .../resource_consumer_handler.go | 0 .../images}/resource-consumer/utils.go | 0 .../images}/volumes-tester/gluster/Dockerfile | 0 .../images}/volumes-tester/gluster/Makefile | 0 .../images}/volumes-tester/gluster/README.md | 2 +- .../images}/volumes-tester/gluster/glusterd.vol | 0 .../images}/volumes-tester/gluster/index.html | 0 .../images}/volumes-tester/gluster/run_gluster.sh | 0 .../images}/volumes-tester/iscsi/Dockerfile | 0 .../images}/volumes-tester/iscsi/Makefile | 0 .../images}/volumes-tester/iscsi/README.md | 2 +- .../images}/volumes-tester/iscsi/block.tar.gz | Bin .../images}/volumes-tester/iscsi/create_block.sh | 0 .../volumes-tester/iscsi/initiatorname.iscsi | 0 .../images}/volumes-tester/iscsi/run_iscsid.sh | 0 .../images}/volumes-tester/iscsi/saveconfig.json | 0 .../images}/volumes-tester/nfs/Dockerfile | 0 .../images}/volumes-tester/nfs/Makefile | 0 .../images}/volumes-tester/nfs/README.md | 2 +- .../images}/volumes-tester/nfs/index.html | 0 .../images}/volumes-tester/nfs/run_nfs.sh | 0 .../images}/volumes-tester/rbd/Dockerfile | 0 .../images}/volumes-tester/rbd/Makefile | 0 .../images}/volumes-tester/rbd/block.tar.gz | Bin .../images}/volumes-tester/rbd/bootstrap.sh | 0 .../images}/volumes-tester/rbd/ceph.conf.sh | 0 .../images}/volumes-tester/rbd/create_block.sh | 0 .../images}/volumes-tester/rbd/keyring | 0 .../images}/volumes-tester/rbd/mon.sh | 0 .../images}/volumes-tester/rbd/osd.sh | 0 60 files changed, 21 insertions(+), 13 deletions(-) rename {contrib/for-tests => test/images}/dnsutils/Dockerfile (100%) rename {contrib/for-tests => test/images}/dnsutils/Makefile (100%) rename {contrib/for-tests => test/images}/entrypoint-tester/Dockerfile (100%) rename {contrib/for-tests => test/images}/entrypoint-tester/Makefile (100%) rename {contrib/for-tests => test/images}/entrypoint-tester/ep.go (100%) rename {contrib/for-tests => test/images}/jessie-dnsutils/Dockerfile (100%) rename {contrib/for-tests => test/images}/jessie-dnsutils/Makefile (100%) rename {contrib/for-tests => test/images}/mount-tester-user/Dockerfile (100%) rename {contrib/for-tests => test/images}/mount-tester-user/Makefile (100%) rename {contrib/for-tests => test/images}/mount-tester/Dockerfile (100%) rename {contrib/for-tests => test/images}/mount-tester/Makefile (100%) rename {contrib/for-tests => test/images}/mount-tester/mt.go (100%) rename {contrib/for-tests => test/images}/network-tester/Dockerfile (100%) rename {contrib/for-tests => test/images}/network-tester/Makefile (100%) rename {contrib/for-tests => test/images}/network-tester/rc.json (100%) rename {contrib/for-tests => test/images}/network-tester/service.json (100%) rename {contrib/for-tests => test/images}/network-tester/webserver.go (100%) rename {contrib/for-tests => test/images}/porter/.gitignore (100%) rename {contrib/for-tests => test/images}/porter/Dockerfile (100%) rename {contrib/for-tests => test/images}/porter/Makefile (100%) rename {contrib/for-tests => test/images}/porter/README.md (80%) rename {contrib/for-tests => test/images}/porter/pod.json (100%) rename {contrib/for-tests => test/images}/porter/porter.go (100%) rename {contrib/for-tests => test/images}/resource-consumer/Dockerfile (100%) rename {contrib/for-tests => test/images}/resource-consumer/Makefile (100%) rename {contrib/for-tests => test/images}/resource-consumer/consume-cpu/consume_cpu.go (100%) rename {contrib/for-tests => test/images}/resource-consumer/resource_consumer.go (100%) rename {contrib/for-tests => test/images}/resource-consumer/resource_consumer_handler.go (100%) rename {contrib/for-tests => test/images}/resource-consumer/utils.go (100%) rename {contrib/for-tests => test/images}/volumes-tester/gluster/Dockerfile (100%) rename {contrib/for-tests => test/images}/volumes-tester/gluster/Makefile (100%) rename {contrib/for-tests => test/images}/volumes-tester/gluster/README.md (78%) rename {contrib/for-tests => test/images}/volumes-tester/gluster/glusterd.vol (100%) rename {contrib/for-tests => test/images}/volumes-tester/gluster/index.html (100%) rename {contrib/for-tests => test/images}/volumes-tester/gluster/run_gluster.sh (100%) rename {contrib/for-tests => test/images}/volumes-tester/iscsi/Dockerfile (100%) rename {contrib/for-tests => test/images}/volumes-tester/iscsi/Makefile (100%) rename {contrib/for-tests => test/images}/volumes-tester/iscsi/README.md (87%) rename {contrib/for-tests => test/images}/volumes-tester/iscsi/block.tar.gz (100%) rename {contrib/for-tests => test/images}/volumes-tester/iscsi/create_block.sh (100%) rename {contrib/for-tests => test/images}/volumes-tester/iscsi/initiatorname.iscsi (100%) rename {contrib/for-tests => test/images}/volumes-tester/iscsi/run_iscsid.sh (100%) rename {contrib/for-tests => test/images}/volumes-tester/iscsi/saveconfig.json (100%) rename {contrib/for-tests => test/images}/volumes-tester/nfs/Dockerfile (100%) rename {contrib/for-tests => test/images}/volumes-tester/nfs/Makefile (100%) rename {contrib/for-tests => test/images}/volumes-tester/nfs/README.md (82%) rename {contrib/for-tests => test/images}/volumes-tester/nfs/index.html (100%) rename {contrib/for-tests => test/images}/volumes-tester/nfs/run_nfs.sh (100%) rename {contrib/for-tests => test/images}/volumes-tester/rbd/Dockerfile (100%) rename {contrib/for-tests => test/images}/volumes-tester/rbd/Makefile (100%) rename {contrib/for-tests => test/images}/volumes-tester/rbd/block.tar.gz (100%) rename {contrib/for-tests => test/images}/volumes-tester/rbd/bootstrap.sh (100%) rename {contrib/for-tests => test/images}/volumes-tester/rbd/ceph.conf.sh (100%) rename {contrib/for-tests => test/images}/volumes-tester/rbd/create_block.sh (100%) rename {contrib/for-tests => test/images}/volumes-tester/rbd/keyring (100%) rename {contrib/for-tests => test/images}/volumes-tester/rbd/mon.sh (100%) rename {contrib/for-tests => test/images}/volumes-tester/rbd/osd.sh (100%) diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index ac7e45941c..7addc1f809 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -83,8 +83,8 @@ readonly KUBE_TEST_TARGETS=($(kube::golang::test_targets)) readonly KUBE_TEST_BINARIES=("${KUBE_TEST_TARGETS[@]##*/}") readonly KUBE_TEST_BINARIES_WIN=("${KUBE_TEST_BINARIES[@]/%/.exe}") readonly KUBE_TEST_PORTABLE=( - contrib/for-tests/network-tester/rc.json - contrib/for-tests/network-tester/service.json + test/images/network-tester/rc.json + test/images/network-tester/service.json hack/e2e.go hack/e2e-internal hack/ginkgo-e2e.sh diff --git a/hack/verify-flags/exceptions.txt b/hack/verify-flags/exceptions.txt index b3c9ad9809..d2fafd279f 100644 --- a/hack/verify-flags/exceptions.txt +++ b/hack/verify-flags/exceptions.txt @@ -11,6 +11,14 @@ pkg/util/oom/oom_linux.go: err = fmt.Errorf("failed to read oom_score_adj: %v" pkg/util/oom/oom_linux.go: err = fmt.Errorf("failed to set oom_score_adj to %d: %v", oomScoreAdj, writeErr) pkg/util/oom/oom_linux.go:// Writes 'value' to /proc//oom_score_adj for all processes in cgroup cgroupName. pkg/cloudprovider/providers/vagrant/vagrant_test.go: testSaltMinionsResponse = []byte(`{ "return": [{"kubernetes-minion-1": {"kernel": "Linux", "domain": "", "zmqversion": "3.2.4", "kernelrelease": "3.11.10-301.fc20.x86_64", "pythonpath": ["/usr/bin", "/usr/lib64/python27.zip", "/usr/lib64/python2.7", "/usr/lib64/python2.7/plat-linux2", "/usr/lib64/python2.7/lib-tk", "/usr/lib64/python2.7/lib-old", "/usr/lib64/python2.7/lib-dynload", "/usr/lib64/python2.7/site-packages", "/usr/lib/python2.7/site-packages"], "etcd_servers": "10.245.1.2", "ip_interfaces": {"lo": ["127.0.0.1"], "docker0": ["172.17.42.1"], "enp0s8": ["10.245.2.2"], "p2p1": ["10.0.2.15"]}, "shell": "/bin/sh", "mem_total": 491, "saltversioninfo": [2014, 1, 7], "osmajorrelease": ["20"], "node_ip": "10.245.2.2", "id": "kubernetes-minion-1", "osrelease": "20", "ps": "ps -efH", "server_id": 1005530826, "num_cpus": 1, "hwaddr_interfaces": {"lo": "00:00:00:00:00:00", "docker0": "56:84:7a:fe:97:99", "enp0s8": "08:00:27:17:c5:0f", "p2p1": "08:00:27:96:96:e1"}, "virtual": "VirtualBox", "osfullname": "Fedora", "master": "kubernetes-master", "ipv4": ["10.0.2.15", "10.245.2.2", "127.0.0.1", "172.17.42.1"], "ipv6": ["::1", "fe80::a00:27ff:fe17:c50f", "fe80::a00:27ff:fe96:96e1"], "cpu_flags": ["fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "cx8", "apic", "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "clflush", "mmx", "fxsr", "sse", "sse2", "syscall", "nx", "rdtscp", "lm", "constant_tsc", "rep_good", "nopl", "pni", "monitor", "ssse3", "lahf_lm"], "localhost": "kubernetes-minion-1", "lsb_distrib_id": "Fedora", "fqdn_ip4": ["127.0.0.1"], "fqdn_ip6": [], "nodename": "kubernetes-minion-1", "saltversion": "2014.1.7", "saltpath": "/usr/lib/python2.7/site-packages/salt", "pythonversion": [2, 7, 5, "final", 0], "host": "kubernetes-minion-1", "os_family": "RedHat", "oscodename": "Heisenbug", "defaultencoding": "UTF-8", "osfinger": "Fedora-20", "roles": ["kubernetes-pool"], "num_gpus": 1, "cpu_model": "Intel(R) Core(TM) i7-4600U CPU @ 2.10GHz", "fqdn": "kubernetes-minion-1", "osarch": "x86_64", "cpuarch": "x86_64", "gpus": [{"model": "VirtualBox Graphics Adapter", "vendor": "unknown"}], "path": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", "os": "Fedora", "defaultlanguage": "en_US"}}]}`) +test/images/mount-tester/mt.go: flag.StringVar(&fsTypePath, "fs_type", "", "Path to print the fs type for") +test/images/mount-tester/mt.go: flag.StringVar(&fileModePath, "file_mode", "", "Path to print the mode bits of") +test/images/mount-tester/mt.go: flag.StringVar(&filePermPath, "file_perm", "", "Path to print the perms of") +test/images/mount-tester/mt.go: flag.StringVar(&readFileContentPath, "file_content", "", "Path to read the file content from") +test/images/mount-tester/mt.go: flag.StringVar(&newFilePath0644, "new_file_0644", "", "Path to write to and read from with perm 0644") +test/images/mount-tester/mt.go: flag.StringVar(&newFilePath0666, "new_file_0666", "", "Path to write to and read from with perm 0666") +test/images/mount-tester/mt.go: flag.StringVar(&newFilePath0777, "new_file_0777", "", "Path to write to and read from with perm 0777") +contrib/mesos/pkg/controllermanager/controllermanager.go: fs.BoolVar(&s.UseHostPortEndpoints, "host_port_endpoints", s.UseHostPortEndpoints, "Map service endpoints to hostIP:hostPort instead of podIP:containerPort. Default true.") contrib/mesos/docs/ha.md:- `--km_path` or else (`--executor_path` and `--proxy_path`) should reference non-local-file URI's and must be identical across schedulers. contrib/mesos/docs/ha.md:$ ./bin/km scheduler ... --mesos_master=zk://zk1:2181,zk2:2181/mesos --ha --km_path=hdfs:///km contrib/mesos/docs/ha.md:- `--auth_path` diff --git a/test/e2e/volumes.go b/test/e2e/volumes.go index 98bc0a47a7..6aa6058d59 100644 --- a/test/e2e/volumes.go +++ b/test/e2e/volumes.go @@ -272,7 +272,7 @@ var _ = Describe("Volumes", func() { ReadOnly: true, }, } - // Must match content of contrib/for-tests/volumes-tester/nfs/index.html + // Must match content of test/images/volumes-tester/nfs/index.html testVolumeClient(c, config, volume, "Hello from NFS!") }) }) @@ -344,12 +344,12 @@ var _ = Describe("Volumes", func() { volume := api.VolumeSource{ Glusterfs: &api.GlusterfsVolumeSource{ EndpointsName: config.prefix + "-server", - // 'test_vol' comes from contrib/for-tests/volumes-tester/gluster/run_gluster.sh + // 'test_vol' comes from test/images/volumes-tester/gluster/run_gluster.sh Path: "test_vol", ReadOnly: true, }, } - // Must match content of contrib/for-tests/volumes-tester/gluster/index.html + // Must match content of test/images/volumes-tester/gluster/index.html testVolumeClient(c, config, volume, "Hello from GlusterFS!") }) }) @@ -389,14 +389,14 @@ var _ = Describe("Volumes", func() { volume := api.VolumeSource{ ISCSI: &api.ISCSIVolumeSource{ TargetPortal: serverIP + ":3260", - // from contrib/for-tests/volumes-tester/iscsi/initiatorname.iscsi + // from test/images/volumes-tester/iscsi/initiatorname.iscsi IQN: "iqn.2003-01.org.linux-iscsi.f21.x8664:sn.4b0aae584f7c", Lun: 0, FSType: "ext2", ReadOnly: true, }, } - // Must match content of contrib/for-tests/volumes-tester/iscsi/block.tar.gz + // Must match content of test/images/volumes-tester/iscsi/block.tar.gz testVolumeClient(c, config, volume, "Hello from iSCSI") }) }) @@ -443,7 +443,7 @@ var _ = Describe("Volumes", func() { Name: config.prefix + "-secret", }, Data: map[string][]byte{ - // from contrib/for-tests/volumes-tester/rbd/keyring + // from test/images/volumes-tester/rbd/keyring "key": []byte("AQDRrKNVbEevChAAEmRC+pW/KBVHxa0w/POILA=="), }, } @@ -473,7 +473,7 @@ var _ = Describe("Volumes", func() { ReadOnly: true, }, } - // Must match content of contrib/for-tests/volumes-tester/gluster/index.html + // Must match content of test/images/volumes-tester/gluster/index.html testVolumeClient(c, config, volume, "Hello from RBD") }) diff --git a/contrib/for-tests/dnsutils/Dockerfile b/test/images/dnsutils/Dockerfile similarity index 100% rename from contrib/for-tests/dnsutils/Dockerfile rename to test/images/dnsutils/Dockerfile diff --git a/contrib/for-tests/dnsutils/Makefile b/test/images/dnsutils/Makefile similarity index 100% rename from contrib/for-tests/dnsutils/Makefile rename to test/images/dnsutils/Makefile diff --git a/contrib/for-tests/entrypoint-tester/Dockerfile b/test/images/entrypoint-tester/Dockerfile similarity index 100% rename from contrib/for-tests/entrypoint-tester/Dockerfile rename to test/images/entrypoint-tester/Dockerfile diff --git a/contrib/for-tests/entrypoint-tester/Makefile b/test/images/entrypoint-tester/Makefile similarity index 100% rename from contrib/for-tests/entrypoint-tester/Makefile rename to test/images/entrypoint-tester/Makefile diff --git a/contrib/for-tests/entrypoint-tester/ep.go b/test/images/entrypoint-tester/ep.go similarity index 100% rename from contrib/for-tests/entrypoint-tester/ep.go rename to test/images/entrypoint-tester/ep.go diff --git a/contrib/for-tests/jessie-dnsutils/Dockerfile b/test/images/jessie-dnsutils/Dockerfile similarity index 100% rename from contrib/for-tests/jessie-dnsutils/Dockerfile rename to test/images/jessie-dnsutils/Dockerfile diff --git a/contrib/for-tests/jessie-dnsutils/Makefile b/test/images/jessie-dnsutils/Makefile similarity index 100% rename from contrib/for-tests/jessie-dnsutils/Makefile rename to test/images/jessie-dnsutils/Makefile diff --git a/contrib/for-tests/mount-tester-user/Dockerfile b/test/images/mount-tester-user/Dockerfile similarity index 100% rename from contrib/for-tests/mount-tester-user/Dockerfile rename to test/images/mount-tester-user/Dockerfile diff --git a/contrib/for-tests/mount-tester-user/Makefile b/test/images/mount-tester-user/Makefile similarity index 100% rename from contrib/for-tests/mount-tester-user/Makefile rename to test/images/mount-tester-user/Makefile diff --git a/contrib/for-tests/mount-tester/Dockerfile b/test/images/mount-tester/Dockerfile similarity index 100% rename from contrib/for-tests/mount-tester/Dockerfile rename to test/images/mount-tester/Dockerfile diff --git a/contrib/for-tests/mount-tester/Makefile b/test/images/mount-tester/Makefile similarity index 100% rename from contrib/for-tests/mount-tester/Makefile rename to test/images/mount-tester/Makefile diff --git a/contrib/for-tests/mount-tester/mt.go b/test/images/mount-tester/mt.go similarity index 100% rename from contrib/for-tests/mount-tester/mt.go rename to test/images/mount-tester/mt.go diff --git a/contrib/for-tests/network-tester/Dockerfile b/test/images/network-tester/Dockerfile similarity index 100% rename from contrib/for-tests/network-tester/Dockerfile rename to test/images/network-tester/Dockerfile diff --git a/contrib/for-tests/network-tester/Makefile b/test/images/network-tester/Makefile similarity index 100% rename from contrib/for-tests/network-tester/Makefile rename to test/images/network-tester/Makefile diff --git a/contrib/for-tests/network-tester/rc.json b/test/images/network-tester/rc.json similarity index 100% rename from contrib/for-tests/network-tester/rc.json rename to test/images/network-tester/rc.json diff --git a/contrib/for-tests/network-tester/service.json b/test/images/network-tester/service.json similarity index 100% rename from contrib/for-tests/network-tester/service.json rename to test/images/network-tester/service.json diff --git a/contrib/for-tests/network-tester/webserver.go b/test/images/network-tester/webserver.go similarity index 100% rename from contrib/for-tests/network-tester/webserver.go rename to test/images/network-tester/webserver.go diff --git a/contrib/for-tests/porter/.gitignore b/test/images/porter/.gitignore similarity index 100% rename from contrib/for-tests/porter/.gitignore rename to test/images/porter/.gitignore diff --git a/contrib/for-tests/porter/Dockerfile b/test/images/porter/Dockerfile similarity index 100% rename from contrib/for-tests/porter/Dockerfile rename to test/images/porter/Dockerfile diff --git a/contrib/for-tests/porter/Makefile b/test/images/porter/Makefile similarity index 100% rename from contrib/for-tests/porter/Makefile rename to test/images/porter/Makefile diff --git a/contrib/for-tests/porter/README.md b/test/images/porter/README.md similarity index 80% rename from contrib/for-tests/porter/README.md rename to test/images/porter/README.md index 30923d7241..ddcad55e2a 100644 --- a/contrib/for-tests/porter/README.md +++ b/test/images/porter/README.md @@ -2,4 +2,4 @@ This directory contains go source, Dockerfile and Makefile for making a test container which serves requested data on ports specified in ENV variables. -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/contrib/for-tests/porter/README.md?pixel)]() +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/porter/README.md?pixel)]() diff --git a/contrib/for-tests/porter/pod.json b/test/images/porter/pod.json similarity index 100% rename from contrib/for-tests/porter/pod.json rename to test/images/porter/pod.json diff --git a/contrib/for-tests/porter/porter.go b/test/images/porter/porter.go similarity index 100% rename from contrib/for-tests/porter/porter.go rename to test/images/porter/porter.go diff --git a/contrib/for-tests/resource-consumer/Dockerfile b/test/images/resource-consumer/Dockerfile similarity index 100% rename from contrib/for-tests/resource-consumer/Dockerfile rename to test/images/resource-consumer/Dockerfile diff --git a/contrib/for-tests/resource-consumer/Makefile b/test/images/resource-consumer/Makefile similarity index 100% rename from contrib/for-tests/resource-consumer/Makefile rename to test/images/resource-consumer/Makefile diff --git a/contrib/for-tests/resource-consumer/consume-cpu/consume_cpu.go b/test/images/resource-consumer/consume-cpu/consume_cpu.go similarity index 100% rename from contrib/for-tests/resource-consumer/consume-cpu/consume_cpu.go rename to test/images/resource-consumer/consume-cpu/consume_cpu.go diff --git a/contrib/for-tests/resource-consumer/resource_consumer.go b/test/images/resource-consumer/resource_consumer.go similarity index 100% rename from contrib/for-tests/resource-consumer/resource_consumer.go rename to test/images/resource-consumer/resource_consumer.go diff --git a/contrib/for-tests/resource-consumer/resource_consumer_handler.go b/test/images/resource-consumer/resource_consumer_handler.go similarity index 100% rename from contrib/for-tests/resource-consumer/resource_consumer_handler.go rename to test/images/resource-consumer/resource_consumer_handler.go diff --git a/contrib/for-tests/resource-consumer/utils.go b/test/images/resource-consumer/utils.go similarity index 100% rename from contrib/for-tests/resource-consumer/utils.go rename to test/images/resource-consumer/utils.go diff --git a/contrib/for-tests/volumes-tester/gluster/Dockerfile b/test/images/volumes-tester/gluster/Dockerfile similarity index 100% rename from contrib/for-tests/volumes-tester/gluster/Dockerfile rename to test/images/volumes-tester/gluster/Dockerfile diff --git a/contrib/for-tests/volumes-tester/gluster/Makefile b/test/images/volumes-tester/gluster/Makefile similarity index 100% rename from contrib/for-tests/volumes-tester/gluster/Makefile rename to test/images/volumes-tester/gluster/Makefile diff --git a/contrib/for-tests/volumes-tester/gluster/README.md b/test/images/volumes-tester/gluster/README.md similarity index 78% rename from contrib/for-tests/volumes-tester/gluster/README.md rename to test/images/volumes-tester/gluster/README.md index d1ca80f79e..75bb0442ab 100644 --- a/contrib/for-tests/volumes-tester/gluster/README.md +++ b/test/images/volumes-tester/gluster/README.md @@ -5,4 +5,4 @@ This container exports test_vol volume with an index.html inside. Used by test/e2e/* to test GlusterfsVolumeSource. Not for production use! -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/contrib/for-tests/volumes-tester/gluster/README.md?pixel)]() +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/volumes-tester/gluster/README.md?pixel)]() diff --git a/contrib/for-tests/volumes-tester/gluster/glusterd.vol b/test/images/volumes-tester/gluster/glusterd.vol similarity index 100% rename from contrib/for-tests/volumes-tester/gluster/glusterd.vol rename to test/images/volumes-tester/gluster/glusterd.vol diff --git a/contrib/for-tests/volumes-tester/gluster/index.html b/test/images/volumes-tester/gluster/index.html similarity index 100% rename from contrib/for-tests/volumes-tester/gluster/index.html rename to test/images/volumes-tester/gluster/index.html diff --git a/contrib/for-tests/volumes-tester/gluster/run_gluster.sh b/test/images/volumes-tester/gluster/run_gluster.sh similarity index 100% rename from contrib/for-tests/volumes-tester/gluster/run_gluster.sh rename to test/images/volumes-tester/gluster/run_gluster.sh diff --git a/contrib/for-tests/volumes-tester/iscsi/Dockerfile b/test/images/volumes-tester/iscsi/Dockerfile similarity index 100% rename from contrib/for-tests/volumes-tester/iscsi/Dockerfile rename to test/images/volumes-tester/iscsi/Dockerfile diff --git a/contrib/for-tests/volumes-tester/iscsi/Makefile b/test/images/volumes-tester/iscsi/Makefile similarity index 100% rename from contrib/for-tests/volumes-tester/iscsi/Makefile rename to test/images/volumes-tester/iscsi/Makefile diff --git a/contrib/for-tests/volumes-tester/iscsi/README.md b/test/images/volumes-tester/iscsi/README.md similarity index 87% rename from contrib/for-tests/volumes-tester/iscsi/README.md rename to test/images/volumes-tester/iscsi/README.md index 8123347834..5dd01fd953 100644 --- a/contrib/for-tests/volumes-tester/iscsi/README.md +++ b/test/images/volumes-tester/iscsi/README.md @@ -11,4 +11,4 @@ Inspired by https://github.com/rvykydal/dockerfile-iscsid block.tar.gz is a small ext2 filesystem created by `make block` (run as root!) -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/contrib/for-tests/volumes-tester/iscsi/README.md?pixel)]() +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/volumes-tester/iscsi/README.md?pixel)]() diff --git a/contrib/for-tests/volumes-tester/iscsi/block.tar.gz b/test/images/volumes-tester/iscsi/block.tar.gz similarity index 100% rename from contrib/for-tests/volumes-tester/iscsi/block.tar.gz rename to test/images/volumes-tester/iscsi/block.tar.gz diff --git a/contrib/for-tests/volumes-tester/iscsi/create_block.sh b/test/images/volumes-tester/iscsi/create_block.sh similarity index 100% rename from contrib/for-tests/volumes-tester/iscsi/create_block.sh rename to test/images/volumes-tester/iscsi/create_block.sh diff --git a/contrib/for-tests/volumes-tester/iscsi/initiatorname.iscsi b/test/images/volumes-tester/iscsi/initiatorname.iscsi similarity index 100% rename from contrib/for-tests/volumes-tester/iscsi/initiatorname.iscsi rename to test/images/volumes-tester/iscsi/initiatorname.iscsi diff --git a/contrib/for-tests/volumes-tester/iscsi/run_iscsid.sh b/test/images/volumes-tester/iscsi/run_iscsid.sh similarity index 100% rename from contrib/for-tests/volumes-tester/iscsi/run_iscsid.sh rename to test/images/volumes-tester/iscsi/run_iscsid.sh diff --git a/contrib/for-tests/volumes-tester/iscsi/saveconfig.json b/test/images/volumes-tester/iscsi/saveconfig.json similarity index 100% rename from contrib/for-tests/volumes-tester/iscsi/saveconfig.json rename to test/images/volumes-tester/iscsi/saveconfig.json diff --git a/contrib/for-tests/volumes-tester/nfs/Dockerfile b/test/images/volumes-tester/nfs/Dockerfile similarity index 100% rename from contrib/for-tests/volumes-tester/nfs/Dockerfile rename to test/images/volumes-tester/nfs/Dockerfile diff --git a/contrib/for-tests/volumes-tester/nfs/Makefile b/test/images/volumes-tester/nfs/Makefile similarity index 100% rename from contrib/for-tests/volumes-tester/nfs/Makefile rename to test/images/volumes-tester/nfs/Makefile diff --git a/contrib/for-tests/volumes-tester/nfs/README.md b/test/images/volumes-tester/nfs/README.md similarity index 82% rename from contrib/for-tests/volumes-tester/nfs/README.md rename to test/images/volumes-tester/nfs/README.md index 112fc98095..a621af9c15 100644 --- a/contrib/for-tests/volumes-tester/nfs/README.md +++ b/test/images/volumes-tester/nfs/README.md @@ -7,4 +7,4 @@ Inspired by https://github.com/cpuguy83/docker-nfs-server. Used by test/e2e/* to test NFSVolumeSource. Not for production use! -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/contrib/for-tests/volumes-tester/nfs/README.md?pixel)]() +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/volumes-tester/nfs/README.md?pixel)]() diff --git a/contrib/for-tests/volumes-tester/nfs/index.html b/test/images/volumes-tester/nfs/index.html similarity index 100% rename from contrib/for-tests/volumes-tester/nfs/index.html rename to test/images/volumes-tester/nfs/index.html diff --git a/contrib/for-tests/volumes-tester/nfs/run_nfs.sh b/test/images/volumes-tester/nfs/run_nfs.sh similarity index 100% rename from contrib/for-tests/volumes-tester/nfs/run_nfs.sh rename to test/images/volumes-tester/nfs/run_nfs.sh diff --git a/contrib/for-tests/volumes-tester/rbd/Dockerfile b/test/images/volumes-tester/rbd/Dockerfile similarity index 100% rename from contrib/for-tests/volumes-tester/rbd/Dockerfile rename to test/images/volumes-tester/rbd/Dockerfile diff --git a/contrib/for-tests/volumes-tester/rbd/Makefile b/test/images/volumes-tester/rbd/Makefile similarity index 100% rename from contrib/for-tests/volumes-tester/rbd/Makefile rename to test/images/volumes-tester/rbd/Makefile diff --git a/contrib/for-tests/volumes-tester/rbd/block.tar.gz b/test/images/volumes-tester/rbd/block.tar.gz similarity index 100% rename from contrib/for-tests/volumes-tester/rbd/block.tar.gz rename to test/images/volumes-tester/rbd/block.tar.gz diff --git a/contrib/for-tests/volumes-tester/rbd/bootstrap.sh b/test/images/volumes-tester/rbd/bootstrap.sh similarity index 100% rename from contrib/for-tests/volumes-tester/rbd/bootstrap.sh rename to test/images/volumes-tester/rbd/bootstrap.sh diff --git a/contrib/for-tests/volumes-tester/rbd/ceph.conf.sh b/test/images/volumes-tester/rbd/ceph.conf.sh similarity index 100% rename from contrib/for-tests/volumes-tester/rbd/ceph.conf.sh rename to test/images/volumes-tester/rbd/ceph.conf.sh diff --git a/contrib/for-tests/volumes-tester/rbd/create_block.sh b/test/images/volumes-tester/rbd/create_block.sh similarity index 100% rename from contrib/for-tests/volumes-tester/rbd/create_block.sh rename to test/images/volumes-tester/rbd/create_block.sh diff --git a/contrib/for-tests/volumes-tester/rbd/keyring b/test/images/volumes-tester/rbd/keyring similarity index 100% rename from contrib/for-tests/volumes-tester/rbd/keyring rename to test/images/volumes-tester/rbd/keyring diff --git a/contrib/for-tests/volumes-tester/rbd/mon.sh b/test/images/volumes-tester/rbd/mon.sh similarity index 100% rename from contrib/for-tests/volumes-tester/rbd/mon.sh rename to test/images/volumes-tester/rbd/mon.sh diff --git a/contrib/for-tests/volumes-tester/rbd/osd.sh b/test/images/volumes-tester/rbd/osd.sh similarity index 100% rename from contrib/for-tests/volumes-tester/rbd/osd.sh rename to test/images/volumes-tester/rbd/osd.sh