Using the cleanup state to collect the log

- always won't be called if the state is ABORTED or FAILURE.
- cleanup will be called as the final step after all state checking.
- Fixed lint error (duplicated key and trailing space)

Change-Id: I22961fd25bd8e4f087ab0ca4bd1db635987a44b7
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 8145a78..ab6f339 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -224,7 +224,7 @@
           configurePod: true
           profile: 'Default'
 
-      # ONF DEMO OCP test job - voltha-master branch 
+      # ONF DEMO OCP test job - voltha-master branch
       - 'build_pod_test':
           testvm: 'menlo-demo-pod'
           config-pod: 'onf-demo-pod'