on_failure to clean up

.gitlab-ci.yml

 stages:  
   - build
   - test
-  - clean
 
 build:tests:
   stage: build
@@ -23,15 +22,9 @@ test:all:
     - vagrant --fixture=monitoring -- up
     - vagrant --fixture=monitoring -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.monitoring"  
     - vagrant --fixture=inputs -- up
-    - vagrant --fixture=inputs -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.inputs"         
-  when: on_success   
-
-clean:
-  stage: clean
-  dependencies:
-    - test:all
-  script: 
+    - vagrant --fixture=inputs -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.inputs"
+  after_script:
     - vagrant --fixture=inputs -- destroy --force     
     - vagrant --fixture=monitoring -- destroy --force     
-    - vagrant --fixture=scripts -- destroy --force
-  when: always
+    - vagrant --fixture=scripts -- destroy --force         
+  when: on_success   
\ No newline at end of file