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

.gitlab-ci.yml

 stages:  
   - test
 
-test_job:
+test_scripts:
   stage: test
   before_script:
-    - vagrant plugin install vagrant-disksize
+    - vagrant --fixture=scripts -- destroy --force 
   script: 
     - vagrant --fixture=scripts -- up
-    - vagrant --fixture=scripts -- ssh -- "cd /vagrant && pytest test/scripts/"
-    - vagrant --fixture=scripts -- destroy --force
+    - vagrant --fixture=scripts -- ssh test-runner -- -tt "cd /vagrant && pytest test/scripts/"
+  after_script:
+    - vagrant --fixture=scripts -- destroy --force       
   when: manual
+  
+test_streaming_sim:
+  stage: test
+  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/"
+  after_script:
+    - vagrant --fixture=streaming-sim -- destroy --force   
+  when: manual  
+  
+test_telegraf_agents:
+  stage: test
+  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/"
+  after_script:
+    - vagrant --fixture=telegraf-agents -- destroy --force       
+  when: manual