added probe container

client/docker-compose.yml

@@ -1,5 +1,17 @@
 version : '2'
 services:
+  scope:
+    container_name: 'scope-perf'
+    build: '.'
+    ports:
+      - '4042:4042'
+    command: ['npm', 'run', 'start-production']
+    environment:
+      - BACKEND_HOST=probe
+    links:
+      - probe
+    volumes:
+      - ./build:/home/weave/build
   probe:
     container_name: 'scope-perf-probe'
     image: weaveworks/scope
@@ -15,6 +27,8 @@ services:
   selenium:
     container_name: 'selenium'
     image: 'selenium/standalone-chrome:3.0.0-dubnium'
+    links:
+      - scope
     ports:
       - '4444:4444'
     environment:
@@ -27,5 +41,5 @@ services:
     ports:
       - '5984:5984'
     volumes:
-      - ./data:/usr/local/var/lib/couchdb
-      - ./local.ini:/usr/local/etc/couchdb/local.ini
+      - ./test/perfjankie/data:/usr/local/var/lib/couchdb
+      - ./test/perfjankie/local.ini:/usr/local/etc/couchdb/local.ini

client/package.json

@@ -86,9 +86,9 @@
     "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 && sleep 10",
-    "perf:run" : "make ../ && . test/run-jankie.sh",
-    "perf:cleanup" : "docker-compose -f test/perfjankie/docker-compose.yml down",
+    "perf:setup" : "npm run build && docker-compose build scope && docker-compose up -d && sleep 10",
+    "perf:run" : " . test/run-jankie.sh",
+    "perf:cleanup" : "docker-compose down",
     "perf" : "npm run perf:setup && npm run perf:run && npm run perf:cleanup"
   },
   "jest": {

client/test/actions/90-nodes-select.js

@@ -43,6 +43,7 @@ module.exports = function(cfg) {
     // More info about wd at https://github.com/admc/wd
     return browser.get('http://' + cfg.host + '/')
       .then(function() {
+        debugger; cfg;
         debug('starting run ' + cfg.run);
         return browser.sleep(2000);
       })

client/test/perfjankie/main.js

@@ -3,7 +3,7 @@ var perfjankie = require('perfjankie');
 var run = process.env.COMMIT || 'commit#Hash'; // A hash for the commit, displayed in the x-axis in the dashboard
 var time = process.env.DATE || new Date().getTime() // Used to sort the data when displaying graph. Can be the time when a commit was made
 var scenario = process.env.ACTIONS || '90-nodes-select';
-var host = process.env.HOST || 'probe:4040';
+var host = process.env.HOST || 'scope:4042';
 var actions = require('../actions/' + scenario)({host: host, run: run});
 var log = (s) => { console.log(s); }