Merge branch 'integration' of gitlab.it-innovation.soton.ac.uk:FLAME/flame-clmc into integration

.gitlab-ci.yml

 stages:  
-  - test
-
-test_scripts:
-  stage: test
+  - test:scripts
+  - test:streaming_sim
+  - test:telegraf_agents
+  
+test:scripts:
+  stage: test:scripts
   before_script:
     - vagrant --fixture=scripts -- destroy --force 
   script: 
@@ -12,24 +14,24 @@ test_scripts:
     - vagrant --fixture=scripts -- destroy --force       
   when: manual
   
-test_streaming_sim:
-  stage: test
+test:streaming_sim:
+  stage: test:streaming_sim
   before_script:
     - vagrant --fixture=streaming-sim -- destroy --force    
   script: 
     - vagrant --fixture=streaming-sim -- up
-    - vagrant --fixture=streaming-sim -- ssh clmc-service -- -tt "cd /vagrant && pytest test/streaming-sim/"
+    - vagrant --fixture=streaming-sim -- ssh test-runner -- -tt "cd /vagrant && pytest test/streaming-sim/"
   after_script:
     - vagrant --fixture=streaming-sim -- destroy --force   
   when: manual  
   
-test_telegraf_agents:
-  stage: test
+test:telegraf_agents:
+  stage: test:telegraf_agents
   before_script:
     - vagrant --fixture=telegraf-agents -- destroy --force      
   script: 
     - vagrant --fixture=telegraf-agents -- up
-    - vagrant --fixture=telegraf-agents -- ssh clmc-service -- -tt "cd /vagrant && pytest test/telegraf-agents/"
+    - vagrant --fixture=telegraf-agents -- ssh test-runner -- -tt "cd /vagrant && pytest test/telegraf-agents/"
   after_script:
     - vagrant --fixture=telegraf-agents -- destroy --force       
   when: manual