splitting causes jobs to run in different directories which is not what we...

splitting causes jobs to run in different directories which is not what we want so back to one job and extending the timeout

.gitlab-ci.yml

 stages:  
   - build
-  - test:scripts
-  - test:monitoring
-  - test:inputs
+  - test
   - clean
 
 build:tests:
@@ -14,35 +12,21 @@ build:tests:
     - build/clmctest-SNAPSHOT.tar.gz
     expire_in: 1 day
 
-test:scripts:
-  stage: test:scripts
+test:all:
+  stage: test
   dependencies: 
     - build:tests
   script: 
     - vagrant --fixture=scripts -- up
     - vagrant --fixture=scripts -- ssh test-runner -- -tt "pip3 install /vagrant/build/clmctest-SNAPSHOT.tar.gz"
     - vagrant --fixture=scripts -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.scripts"
-  when: on_success   
-  
-test:monitoring:
-  stage: test:monitoring
-  dependencies: 
-    - test:scripts
-  script: 
     - vagrant --fixture=monitoring -- up
     - vagrant --fixture=monitoring -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.monitoring"  
-  when: on_success   
-  
-test:inputs:
-  stage: test:inputs
-  dependencies: 
-    - test:monitoring
-  script: 
     - vagrant --fixture=inputs -- up
-    - vagrant --fixture=inputs -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.inputs"
-  when: on_success     
+    - vagrant --fixture=inputs -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.inputs"        
+  when: on_success      
   
-clean:test:
+clean:
   stage: clean
   script: 
     - echo "Clean VMs"