engine: Enable deployment and testing for release jobs

[infra/cicd.git] / jjb / engine / verify-jobs / engine-verify-online-deploy-test.yaml

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 bd53c61af2531177dc3aec4efd79f877eb04c1c3..c48db3fa1398d8199e898a016448213eb3a3d9f2 100644 (file)
--- 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:
@@ -109,6 +109,10 @@
           name: TEST_SUITE
           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'
@@ -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