engine: Enable deployment and testing for release jobs

Change-Id: I28f455dee369eaca9f91b5210401fa24f57707c4
diff --git a/jjb/engine/verify-jobs/engine-verify-online-deploy-test.yaml b/jjb/engine/verify-jobs/engine-verify-online-deploy-test.yaml
index bd53c61..c48db3f 100644
--- a/jjb/engine/verify-jobs/engine-verify-online-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-online-deploy-test.yaml
@@ -30,7 +30,7 @@
 
     phase:
       - deploy
-      - test
+      - functest
 
     type:
       - virtual:
@@ -110,6 +110,10 @@
           default: 'healthcheck'
           description: 'Test suite to run'
       - string:
+          name: YARDSTICK_DISPATCHER
+          default: 'file'
+          description: 'Dispatcher to use for Yardstick reporting'
+      - string:
           name: DELETE_STACK
           default: 'true'
           description: 'Delete the stack upon completion of the build'
@@ -146,9 +150,9 @@
           clean_before: false
 
     builders:
-      - 'wait-pkg-mgr-macro'
-      - 'generate-ssh-keypair-macro'
       - 'download-artifact-macro'
+      - 'generate-ssh-keypair-macro'
+      - 'wait-pkg-mgr-macro'
       - multijob:
           name: "online deployment on {type} instances"
           condition: SUCCESSFUL
@@ -164,7 +168,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'engine-verify-online-test-{distro}-city-{type}-master'
+            - name: 'engine-verify-online-functest-{distro}-city-{type}-master'
               current-parameters: true
               node-parameters: true
               kill-phase-on: FAILURE