From fe27d44ec87839be37ccb37ae8d3bbe65554a6aa Mon Sep 17 00:00:00 2001 From: Jun HU Date: Thu, 12 May 2016 17:41:07 -0400 Subject: [PATCH 1/3] clean new line --- circle.yml | 5 +++-- docker-compose.yml | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index 66cddce9c4a..ca51d7d9788 100644 --- a/circle.yml +++ b/circle.yml @@ -12,10 +12,11 @@ machine: dependencies: pre: - - docker pull plotly/testbed:latest + - docker pull plotly/testbed:candidate post: - npm run cibuild - - docker run -d --name mytestbed -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/testbed:latest + - docker run -d --name mytestbed -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/testbed:candidate + - sudo lxc-attach -n "$(docker inspect --format '{{.Id}}' mytestbed)" -- bash -c "cp -f /var/www/streambed/image_server/plotly.js/test/image/index.html /var/www/streambed/image_server/server_app/index.html" - wget --server-response --spider --tries=8 --retry-connrefused http://localhost:9010/ping test: override: diff --git a/docker-compose.yml b/docker-compose.yml index 0433c0569e0..b726ec7fec7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,9 +13,8 @@ dev: container_name: imagetest - image: plotly/testbed:latest + image: plotly/testbed:candidate volumes: - .:/var/www/streambed/image_server/plotly.js ports: - "9010:9010" - - "2022:22" From 0f5f14d41e4256bd3d1f3195be5887ffa0c564ee Mon Sep 17 00:00:00 2001 From: Jun HU Date: Mon, 16 May 2016 10:39:49 -0400 Subject: [PATCH 2/3] try 10 times instead of 8 for local testing --- tasks/baseline.sh | 2 +- tasks/test_export.sh | 2 +- tasks/test_image.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/baseline.sh b/tasks/baseline.sh index 84dcd638e13..7b757d058bb 100755 --- a/tasks/baseline.sh +++ b/tasks/baseline.sh @@ -13,7 +13,7 @@ CMD=( "cd /var/www/streambed/image_server/plotly.js &&" "cp -f test/image/index.html ../server_app/index.html &&" "supervisorctl restart nw1 &&" - "wget --server-response --spider --tries=8 --retry-connrefused http://localhost:9010/ping &&" + "wget --server-response --spider --tries=10 --retry-connrefused http://localhost:9010/ping &&" "node test/image/make_baseline.js $1" ) diff --git a/tasks/test_export.sh b/tasks/test_export.sh index 6ba0c09c5c3..2936c0126d3 100755 --- a/tasks/test_export.sh +++ b/tasks/test_export.sh @@ -13,7 +13,7 @@ CMD=( "cd /var/www/streambed/image_server/plotly.js &&" "cp -f test/image/index.html ../server_app/index.html &&" "supervisorctl restart nw1 && " - "wget --server-response --spider --tries=8 --retry-connrefused http://localhost:9010/ping &&" + "wget --server-response --spider --tries=10 --retry-connrefused http://localhost:9010/ping &&" "node test/image/export_test.js $1" ) diff --git a/tasks/test_image.sh b/tasks/test_image.sh index c931f5710f3..4cbb0aa2d78 100755 --- a/tasks/test_image.sh +++ b/tasks/test_image.sh @@ -13,7 +13,7 @@ CMD=( "cd /var/www/streambed/image_server/plotly.js &&" "cp -f test/image/index.html ../server_app/index.html &&" "supervisorctl restart nw1 && " - "wget --server-response --spider --tries=8 --retry-connrefused http://localhost:9010/ping &&" + "wget --server-response --spider --tries=10 --retry-connrefused http://localhost:9010/ping &&" "node test/image/compare_pixels_test.js $1" ) From 0488aecdfa7436becc65b6da21c02c5438ad25c2 Mon Sep 17 00:00:00 2001 From: Jun HU Date: Tue, 17 May 2016 13:40:12 -0400 Subject: [PATCH 3/3] using latest --- circle.yml | 4 ++-- docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index ca51d7d9788..dff2ee255f5 100644 --- a/circle.yml +++ b/circle.yml @@ -12,10 +12,10 @@ machine: dependencies: pre: - - docker pull plotly/testbed:candidate + - docker pull plotly/testbed:latest post: - npm run cibuild - - docker run -d --name mytestbed -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/testbed:candidate + - docker run -d --name mytestbed -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/testbed:latest - sudo lxc-attach -n "$(docker inspect --format '{{.Id}}' mytestbed)" -- bash -c "cp -f /var/www/streambed/image_server/plotly.js/test/image/index.html /var/www/streambed/image_server/server_app/index.html" - wget --server-response --spider --tries=8 --retry-connrefused http://localhost:9010/ping test: diff --git a/docker-compose.yml b/docker-compose.yml index b726ec7fec7..48c6568ff67 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ dev: container_name: imagetest - image: plotly/testbed:candidate + image: plotly/testbed:latest volumes: - .:/var/www/streambed/image_server/plotly.js ports: