From 28cf220de1df9392457dbe831ac02875099805fc Mon Sep 17 00:00:00 2001 From: Juan Batiz-Benet Date: Wed, 7 Jan 2015 07:27:44 -0800 Subject: [PATCH] dockertest -> test/3nodetest --- dockertest/bin/save_logs.sh | 8 -------- {dockertest => test/3nodetest}/Makefile | 9 +++++---- {dockertest => test/3nodetest}/README.md | 0 {dockertest => test/3nodetest}/bin/.gitignore | 0 {dockertest => test/3nodetest}/bin/clean.sh | 0 test/3nodetest/bin/save_logs.sh | 8 ++++++++ {dockertest => test/3nodetest}/bootstrap/Dockerfile | 0 {dockertest => test/3nodetest}/bootstrap/README.md | 0 {dockertest => test/3nodetest}/bootstrap/config | 0 {dockertest => test/3nodetest}/build/.gitignore | 0 {dockertest => test/3nodetest}/build/.gitkeep | 0 {dockertest => test/3nodetest}/client/Dockerfile | 0 {dockertest => test/3nodetest}/client/config | 0 {dockertest => test/3nodetest}/client/run.sh | 12 ++++++------ {dockertest => test/3nodetest}/data/.gitignore | 0 {dockertest => test/3nodetest}/data/Dockerfile | 0 {dockertest => test/3nodetest}/fig.yml | 0 {dockertest => test/3nodetest}/run-test-on-img.sh | 0 {dockertest => test/3nodetest}/server/Dockerfile | 0 {dockertest => test/3nodetest}/server/README.md | 0 {dockertest => test/3nodetest}/server/config | 0 {dockertest => test/3nodetest}/server/run.sh | 6 +++--- test/jenkins/network-test.sh | 13 +++++++++++++ 23 files changed, 35 insertions(+), 21 deletions(-) delete mode 100644 dockertest/bin/save_logs.sh rename {dockertest => test/3nodetest}/Makefile (72%) rename {dockertest => test/3nodetest}/README.md (100%) rename {dockertest => test/3nodetest}/bin/.gitignore (100%) rename {dockertest => test/3nodetest}/bin/clean.sh (100%) create mode 100644 test/3nodetest/bin/save_logs.sh rename {dockertest => test/3nodetest}/bootstrap/Dockerfile (100%) rename {dockertest => test/3nodetest}/bootstrap/README.md (100%) rename {dockertest => test/3nodetest}/bootstrap/config (100%) rename {dockertest => test/3nodetest}/build/.gitignore (100%) rename {dockertest => test/3nodetest}/build/.gitkeep (100%) rename {dockertest => test/3nodetest}/client/Dockerfile (100%) rename {dockertest => test/3nodetest}/client/config (100%) rename {dockertest => test/3nodetest}/client/run.sh (67%) rename {dockertest => test/3nodetest}/data/.gitignore (100%) rename {dockertest => test/3nodetest}/data/Dockerfile (100%) rename {dockertest => test/3nodetest}/fig.yml (100%) rename {dockertest => test/3nodetest}/run-test-on-img.sh (100%) rename {dockertest => test/3nodetest}/server/Dockerfile (100%) rename {dockertest => test/3nodetest}/server/README.md (100%) rename {dockertest => test/3nodetest}/server/config (100%) rename {dockertest => test/3nodetest}/server/run.sh (79%) create mode 100755 test/jenkins/network-test.sh diff --git a/dockertest/bin/save_logs.sh b/dockertest/bin/save_logs.sh deleted file mode 100644 index 6fa2bed81..000000000 --- a/dockertest/bin/save_logs.sh +++ /dev/null @@ -1,8 +0,0 @@ -# STRIP strips color from terminal output -STRIP="perl -pe 's/\e\[?.*?[\@-~]//g'" - -# TODO use a for loop like a grownup -docker logs dockertest_bootstrap_1 2>&1 | eval $STRIP > ./build/bootstrap.log -docker logs dockertest_client_1 2>&1 | eval $STRIP > ./build/client.log -docker logs dockertest_data_1 2>&1 | eval $STRIP > ./build/data.log -docker logs dockertest_server_1 2>&1 | eval $STRIP > ./build/server.log diff --git a/dockertest/Makefile b/test/3nodetest/Makefile similarity index 72% rename from dockertest/Makefile rename to test/3nodetest/Makefile index 694e8e491..ec13b9367 100644 --- a/dockertest/Makefile +++ b/test/3nodetest/Makefile @@ -1,5 +1,6 @@ -RANDOMSRC = Godeps/_workspace/src/github.com/jbenet/go-random/random +RANDOMSRC = ../../Godeps/_workspace/src/github.com/jbenet/go-random IMAGE_NAME = ipfs-test-latest +IPFS_ROOT = ../.. test: clean setup ./run-test-on-img.sh $(IMAGE_NAME) @@ -15,13 +16,13 @@ data/filetiny: Makefile data/filerand: bin/random ./bin/random 50000000 > ./data/filerand -bin/random: - go build -o ./bin/random ../$(RANDOMSRC) +bin/random: $(RANDOMSRC)/**/*.go + go build -o ./bin/random $(RANDOMSRC)/random # just build it every time... this part isn't # even the lengthy part, and it decreases pain. docker_ipfs_image: - cd .. && docker build -t $(IMAGE_NAME) . + cd $(IPFS_ROOT) && docker build -t $(IMAGE_NAME) . docker images | grep $(IMAGE_NAME) clean: diff --git a/dockertest/README.md b/test/3nodetest/README.md similarity index 100% rename from dockertest/README.md rename to test/3nodetest/README.md diff --git a/dockertest/bin/.gitignore b/test/3nodetest/bin/.gitignore similarity index 100% rename from dockertest/bin/.gitignore rename to test/3nodetest/bin/.gitignore diff --git a/dockertest/bin/clean.sh b/test/3nodetest/bin/clean.sh similarity index 100% rename from dockertest/bin/clean.sh rename to test/3nodetest/bin/clean.sh diff --git a/test/3nodetest/bin/save_logs.sh b/test/3nodetest/bin/save_logs.sh new file mode 100644 index 000000000..6586dcd1b --- /dev/null +++ b/test/3nodetest/bin/save_logs.sh @@ -0,0 +1,8 @@ +# STRIP strips color from terminal output +STRIP="perl -pe 's/\e\[?.*?[\@-~]//g'" + +# TODO use a for loop like a grownup +docker logs 3nodetest_bootstrap_1 2>&1 | eval $STRIP > ./build/bootstrap.log +docker logs 3nodetest_client_1 2>&1 | eval $STRIP > ./build/client.log +docker logs 3nodetest_data_1 2>&1 | eval $STRIP > ./build/data.log +docker logs 3nodetest_server_1 2>&1 | eval $STRIP > ./build/server.log diff --git a/dockertest/bootstrap/Dockerfile b/test/3nodetest/bootstrap/Dockerfile similarity index 100% rename from dockertest/bootstrap/Dockerfile rename to test/3nodetest/bootstrap/Dockerfile diff --git a/dockertest/bootstrap/README.md b/test/3nodetest/bootstrap/README.md similarity index 100% rename from dockertest/bootstrap/README.md rename to test/3nodetest/bootstrap/README.md diff --git a/dockertest/bootstrap/config b/test/3nodetest/bootstrap/config similarity index 100% rename from dockertest/bootstrap/config rename to test/3nodetest/bootstrap/config diff --git a/dockertest/build/.gitignore b/test/3nodetest/build/.gitignore similarity index 100% rename from dockertest/build/.gitignore rename to test/3nodetest/build/.gitignore diff --git a/dockertest/build/.gitkeep b/test/3nodetest/build/.gitkeep similarity index 100% rename from dockertest/build/.gitkeep rename to test/3nodetest/build/.gitkeep diff --git a/dockertest/client/Dockerfile b/test/3nodetest/client/Dockerfile similarity index 100% rename from dockertest/client/Dockerfile rename to test/3nodetest/client/Dockerfile diff --git a/dockertest/client/config b/test/3nodetest/client/config similarity index 100% rename from dockertest/client/config rename to test/3nodetest/client/config diff --git a/dockertest/client/run.sh b/test/3nodetest/client/run.sh similarity index 67% rename from dockertest/client/run.sh rename to test/3nodetest/client/run.sh index edbf86431..5c7c59a6e 100644 --- a/dockertest/client/run.sh +++ b/test/3nodetest/client/run.sh @@ -1,16 +1,16 @@ ipfs bootstrap add /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE -echo "dockertest> starting client daemon" +echo "3nodetest> starting client daemon" ipfs daemon & sleep 3 while [ ! -f /data/idtiny ] do - echo "dockertest> waiting for server to add the file..." + echo "3nodetest> waiting for server to add the file..." sleep 1 done -echo "dockertest> client found file with hash:" $(cat /data/idtiny) +echo "3nodetest> client found file with hash:" $(cat /data/idtiny) ipfs cat $(cat /data/idtiny) > filetiny @@ -25,10 +25,10 @@ fi while [ ! -f /data/idrand ] do - echo "dockertest> waiting for server to add the file..." + echo "3nodetest> waiting for server to add the file..." sleep 1 done -echo "dockertest> client found file with hash:" $(cat /data/idrand) +echo "3nodetest> client found file with hash:" $(cat /data/idrand) cat /data/idrand @@ -46,4 +46,4 @@ if (($? > 0)); then exit 1 fi -echo "dockertest> success" +echo "3nodetest> success" diff --git a/dockertest/data/.gitignore b/test/3nodetest/data/.gitignore similarity index 100% rename from dockertest/data/.gitignore rename to test/3nodetest/data/.gitignore diff --git a/dockertest/data/Dockerfile b/test/3nodetest/data/Dockerfile similarity index 100% rename from dockertest/data/Dockerfile rename to test/3nodetest/data/Dockerfile diff --git a/dockertest/fig.yml b/test/3nodetest/fig.yml similarity index 100% rename from dockertest/fig.yml rename to test/3nodetest/fig.yml diff --git a/dockertest/run-test-on-img.sh b/test/3nodetest/run-test-on-img.sh similarity index 100% rename from dockertest/run-test-on-img.sh rename to test/3nodetest/run-test-on-img.sh diff --git a/dockertest/server/Dockerfile b/test/3nodetest/server/Dockerfile similarity index 100% rename from dockertest/server/Dockerfile rename to test/3nodetest/server/Dockerfile diff --git a/dockertest/server/README.md b/test/3nodetest/server/README.md similarity index 100% rename from dockertest/server/README.md rename to test/3nodetest/server/README.md diff --git a/dockertest/server/config b/test/3nodetest/server/config similarity index 100% rename from dockertest/server/config rename to test/3nodetest/server/config diff --git a/dockertest/server/run.sh b/test/3nodetest/server/run.sh similarity index 79% rename from dockertest/server/run.sh rename to test/3nodetest/server/run.sh index 6dab347d2..d357faa11 100644 --- a/dockertest/server/run.sh +++ b/test/3nodetest/server/run.sh @@ -3,7 +3,7 @@ ipfs bootstrap add /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_T # wait for daemon to start/bootstrap # alternatively use ipfs swarm connect -echo "dockertest> starting server daemon" +echo "3nodetest> starting server daemon" ipfs daemon & sleep 3 # TODO instead of bootrapping: ipfs swarm connect /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE @@ -11,11 +11,11 @@ sleep 3 # must mount this volume from data container ipfs add -q /data/filetiny > tmptiny mv tmptiny /data/idtiny -echo "dockertest> added tiny file. hash is" $(cat /data/idtiny) +echo "3nodetest> added tiny file. hash is" $(cat /data/idtiny) ipfs add -q /data/filerand > tmprand mv tmprand /data/idrand -echo "dockertest> added rand file. hash is" $(cat /data/idrand) +echo "3nodetest> added rand file. hash is" $(cat /data/idrand) # allow ample time for the client to pull the data sleep 10000000 diff --git a/test/jenkins/network-test.sh b/test/jenkins/network-test.sh new file mode 100755 index 000000000..fcc43c91c --- /dev/null +++ b/test/jenkins/network-test.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +export GOPATH=$WORKSPACE + +PWD=`pwd` +cd ../3nodetest +make clean +make test +make save_logs + +docker cp 3nodetest_server_1:/root/.go-ipfs/logs/events.log $(PWD)/build/server-events.log +docker cp 3nodetest_bootstrap_1:/root/.go-ipfs/logs/events.log $(PWD)/build/bootstrap-events.log +docker cp 3nodetest_client_1:/root/.go-ipfs/logs/events.log $(PWD)/build/client-events.log