From 8d08016b6e5985569ca5d04ef3e2690e78809f54 Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 25 Jul 2016 11:38:19 -0300 Subject: [test] use tox and couchdb image to run tests --- scripts/docker/Makefile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'scripts/docker/Makefile') diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile index 4fa2e264..6f30a341 100644 --- a/scripts/docker/Makefile +++ b/scripts/docker/Makefile @@ -27,11 +27,14 @@ MEMORY ?= 512m # Docker image generation (main make target) # ############################################## -all: image +all: soledad-image couchdb-image -image: +soledad-image: docker build -t $(IMAGE_NAME) . +couchdb-image: + docker pull couchdb + ################################################## # Run a Soledad Server inside a docker container # ################################################## @@ -69,16 +72,18 @@ run-client-bootstrap: /usr/local/soledad/run-client-bootstrap.sh ################################################# -# Run all trial tests inside a docker container # +# Run all tests inside a docker container # ################################################# -run-trial: +run-tox: + docker run -d --name couchdb couchdb docker run -t -i \ --memory="$(MEMORY)" \ --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \ --env="SOLEDAD_BRANCH=$(SOLEDAD_BRANCH)" \ + --link couchdb \ $(IMAGE_NAME) \ - /usr/local/soledad/run-trial.sh + /usr/local/soledad/run-tox.sh ############################################ # Performance tests and graphic generation # @@ -123,7 +128,7 @@ cp-perf-result: # Other helper targets # ######################## -run-shell: image +run-shell: soledad-image docker run -t -i \ --memory="$(MEMORY)" \ $(IMAGE_NAME) \ -- cgit v1.2.3 From 6f98a8d61c33a4fc3619f998eeea0075d51c739b Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 25 Jul 2016 21:31:46 -0300 Subject: [test] add rules to run perf test on docker with separate couchdb server container --- scripts/docker/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'scripts/docker/Makefile') diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile index 6f30a341..6ad4cced 100644 --- a/scripts/docker/Makefile +++ b/scripts/docker/Makefile @@ -89,8 +89,15 @@ run-tox: # Performance tests and graphic generation # ############################################ -run-perf-test: - helper/run-test.sh perf +run-perf: + docker run -d --name couchdb couchdb + docker run -t -i \ + --memory="$(MEMORY)" \ + --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \ + --env="SOLEDAD_BRANCH=$(SOLEDAD_BRANCH)" \ + --link couchdb \ + $(IMAGE_NAME) \ + /usr/local/soledad/run-tox-perf.sh run-client-perf: @if [ -z "$(CONTAINER_ID_FILE)" ]; then \ -- cgit v1.2.3 From 76acb8f39a32b6b61f00af571bae9bd48c0a5d62 Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 25 Jul 2016 21:51:45 -0300 Subject: [test] use random name for couchdb container in docker perf test --- scripts/docker/Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'scripts/docker/Makefile') diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile index 6ad4cced..4b4d4496 100644 --- a/scripts/docker/Makefile +++ b/scripts/docker/Makefile @@ -76,12 +76,14 @@ run-client-bootstrap: ################################################# run-tox: - docker run -d --name couchdb couchdb + name=$$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 5 | head -n 1); \ + docker run -d --name $${name} couchdb; \ docker run -t -i \ --memory="$(MEMORY)" \ --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \ --env="SOLEDAD_BRANCH=$(SOLEDAD_BRANCH)" \ - --link couchdb \ + --env="COUCH_URL=http://$${name}:5984" \ + --link $${name} \ $(IMAGE_NAME) \ /usr/local/soledad/run-tox.sh @@ -90,14 +92,17 @@ run-tox: ############################################ run-perf: - docker run -d --name couchdb couchdb + name=$$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 5 | head -n 1); \ + docker run -d --name $${name} couchdb; \ docker run -t -i \ --memory="$(MEMORY)" \ --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \ --env="SOLEDAD_BRANCH=$(SOLEDAD_BRANCH)" \ - --link couchdb \ + --env="SOLEDAD_PRELOAD_NUM=$(SOLEDAD_PRELOAD_NUM)" \ + --env="COUCH_URL=http://$${name}:5984" \ + --link $${name} \ $(IMAGE_NAME) \ - /usr/local/soledad/run-tox-perf.sh + /usr/local/soledad/run-perf.sh run-client-perf: @if [ -z "$(CONTAINER_ID_FILE)" ]; then \ -- cgit v1.2.3 From 682aab0b30e479ea4e826f0636340bb100b36c0a Mon Sep 17 00:00:00 2001 From: drebs Date: Tue, 26 Jul 2016 13:44:50 -0300 Subject: [test] add custom couchdb docker image --- scripts/docker/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/docker/Makefile') diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile index 4b4d4496..1bb57757 100644 --- a/scripts/docker/Makefile +++ b/scripts/docker/Makefile @@ -33,7 +33,7 @@ soledad-image: docker build -t $(IMAGE_NAME) . couchdb-image: - docker pull couchdb + (cd couchdb/ && make) ################################################## # Run a Soledad Server inside a docker container # @@ -77,7 +77,7 @@ run-client-bootstrap: run-tox: name=$$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 5 | head -n 1); \ - docker run -d --name $${name} couchdb; \ + docker run -d --name $${name} leap/couchdb; \ docker run -t -i \ --memory="$(MEMORY)" \ --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \ @@ -93,7 +93,7 @@ run-tox: run-perf: name=$$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 5 | head -n 1); \ - docker run -d --name $${name} couchdb; \ + docker run -d --name $${name} leap/couchdb; \ docker run -t -i \ --memory="$(MEMORY)" \ --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \ -- cgit v1.2.3 From 6fd0062c4c2199e610d7832bbfbd57a07abab9e1 Mon Sep 17 00:00:00 2001 From: drebs Date: Tue, 9 Aug 2016 15:38:39 -0300 Subject: [test] use "leapcode" in docker image name "leapcode" is the LEAP docker hub organisation varac could squat (https://hub.docker.com/r/leap/ was already taken). --- scripts/docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/docker/Makefile') diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile index 1bb57757..0fdc93fa 100644 --- a/scripts/docker/Makefile +++ b/scripts/docker/Makefile @@ -16,7 +16,7 @@ # Some configurations you might override when calling this makefile # ##################################################################### -IMAGE_NAME ?= leap/soledad:1.0 +IMAGE_NAME ?= leapcode/soledad:1.0 SOLEDAD_REMOTE ?= https://0xacab.org/leap/soledad.git SOLEDAD_BRANCH ?= develop SOLEDAD_PRELOAD_NUM ?= 100 -- cgit v1.2.3 From 308384eba7da58fbfdc17ead35a98216880206b5 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Wed, 5 Oct 2016 01:19:51 -0300 Subject: [feature] use latest image Instead of hardcoding a version. This should give us the flexibility of changing images without changing code. --- scripts/docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/docker/Makefile') diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile index 0fdc93fa..7050526a 100644 --- a/scripts/docker/Makefile +++ b/scripts/docker/Makefile @@ -16,7 +16,7 @@ # Some configurations you might override when calling this makefile # ##################################################################### -IMAGE_NAME ?= leapcode/soledad:1.0 +IMAGE_NAME ?= leapcode/soledad:latest SOLEDAD_REMOTE ?= https://0xacab.org/leap/soledad.git SOLEDAD_BRANCH ?= develop SOLEDAD_PRELOAD_NUM ?= 100 -- cgit v1.2.3