From ed20f1f43c7f2b9f62fd2da922bf3f17b17fa0c7 Mon Sep 17 00:00:00 2001 From: jpellizzari Date: Wed, 2 Nov 2016 15:27:03 -0700 Subject: [PATCH] Cleanup script and address change --- client/package.json | 4 ++-- client/test/perfjankie/main.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/package.json b/client/package.json index eefa918e4..62d5c3f06 100644 --- a/client/package.json +++ b/client/package.json @@ -86,10 +86,10 @@ "clean": "rm build/app.js", "noprobe": "../scope stop && ../scope launch --no-probe --app.window 8760h", "loadreport": "npm run noprobe && sleep 1 && curl -X POST -H \"Content-Type: application/json\" http://$BACKEND_HOST/api/report -d", - "perf:setup" : "docker-compose -f test/perfjankie/docker-compose.yml up -d", + "perf:setup" : "docker-compose -f test/perfjankie/docker-compose.yml up -d && sleep 10", "perf:run" : "make ../ && . test/run-jankie.sh", "perf:cleanup" : "docker-compose -f test/perfjankie/docker-compose.yml down", - "perf" : "npm run perf:setup && npm run perf:run" + "perf" : "npm run perf:setup && npm run perf:run && npm run perf:cleanup" }, "jest": { "scriptPreprocessor": "/node_modules/babel-jest", diff --git a/client/test/perfjankie/main.js b/client/test/perfjankie/main.js index 5bd734a67..60e874e2f 100644 --- a/client/test/perfjankie/main.js +++ b/client/test/perfjankie/main.js @@ -17,7 +17,7 @@ perfjankie({ /* Identifies where the data and the dashboard are saved */ couch: { - server: 'http://local.docker:5984', + server: 'http://localhost:5984', database: 'performance', updateSite: !process.env.CI, // If true, updates the couchApp that shows the dashboard. Set to false in when running Continuous integration, run this the first time using command line. // onlyUpdateSite: false // No data to upload, just update the site. Recommended to do from dev box as couchDB instance may require special access to create views.