Add functest multijobs back to apex.

fingers crossed

Change-Id: I220a36ec8a6a0d95e847a5672c4d8e5c0d34c5ac
Signed-off-by: agardner <agardner@linuxfoundation.org>

2 files changed, 96 insertions, 94 deletions

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 76f4bae41..cf29b928c 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -288,6 +288,7 @@
           block-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
+            - 'functest.*'
             - 'yardstick.*'
             - 'dovetail.*'
             - 'storperf.*'
@@ -371,23 +372,23 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
-#      - multijob:
-#          name: functest-smoke
-#          condition: SUCCESSFUL
-#          projects:
-#            - name: 'functest-apex-virtual-suite-{stream}'
-#              current-parameters: false
-#              predefined-parameters: |
-#                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-#                FUNCTEST_SUITE_NAME=healthcheck
-#                GERRIT_BRANCH=$GERRIT_BRANCH
-#                GERRIT_REFSPEC=$GERRIT_REFSPEC
-#                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-#                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-#              node-parameters: true
-#              kill-phase-on: NEVER
-#              abort-all-job: true
-#              git-revision: false
+      - multijob:
+          name: functest-smoke
+          condition: SUCCESSFUL
+          projects:
+            - name: 'functest-apex-virtual-suite-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                FUNCTEST_SUITE_NAME=healthcheck
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
 
 # Baremetal Deploy and Test
 - job-template:
@@ -504,18 +505,18 @@
     builders:
       - description-setter:
           description: "Testing on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
-#      - multijob:
-#          name: Functest
-#          condition: ALWAYS
-#          projects:
-#            - name: 'functest-apex-baremetal-daily-{scenario_stream}'
-#              node-parameters: true
-#              current-parameters: false
-#              predefined-parameters:
-#                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-#              kill-phase-on: NEVER
-#              abort-all-job: false
-#              git-revision: false
+      - multijob:
+          name: Functest
+          condition: ALWAYS
+          projects:
+            - name: 'functest-apex-baremetal-daily-{scenario_stream}'
+              node-parameters: true
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              kill-phase-on: NEVER
+              abort-all-job: false
+              git-revision: false
       - multijob:
           name: Yardstick
           condition: ALWAYS
@@ -734,23 +735,23 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: false
-#      - multijob:
-#          name: functest-smoke
-#          condition: SUCCESSFUL
-#          projects:
-#            - name: 'functest-apex-virtual-suite-{stream}'
-#              current-parameters: false
-#              predefined-parameters: |
-#                DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
-#                FUNCTEST_SUITE_NAME=tempest_smoke_serial
-#                GERRIT_BRANCH=$GERRIT_BRANCH
-#                GERRIT_REFSPEC=$GERRIT_REFSPEC
-#                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-#                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-#              node-parameters: true
-#              kill-phase-on: FAILURE
-#              abort-all-job: true
-#              git-revision: false
+      - multijob:
+          name: functest-smoke
+          condition: SUCCESSFUL
+          projects:
+            - name: 'functest-apex-virtual-suite-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
+                FUNCTEST_SUITE_NAME=tempest_smoke_serial
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+              git-revision: false
       - multijob:
           name: create snapshot
           condition: SUCCESSFUL
@@ -902,7 +903,7 @@
       - string:
           name: SSH_KEY
           default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex.'
+          description: 'SSH key to use for Apex'
 
     properties:
       - logrotate-default
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 5141eade5..ab65c4e2b 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -166,6 +166,7 @@
           block-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
+            - 'functest.*'
             - 'yardstick.*'
             - 'dovetail.*'
             - 'storperf.*'
@@ -249,23 +250,23 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
-#      - multijob:
-#          name: functest-smoke
-#          condition: SUCCESSFUL
-#          projects:
-#            - name: 'functest-apex-virtual-suite-{stream}'
-#              current-parameters: false
-#              predefined-parameters: |
-#                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-#                FUNCTEST_SUITE_NAME=healthcheck
-#                GERRIT_BRANCH=$GERRIT_BRANCH
-#                GERRIT_REFSPEC=$GERRIT_REFSPEC
-#                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-#                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-#              node-parameters: true
-#              kill-phase-on: NEVER
-#              abort-all-job: true
-#              git-revision: false
+      - multijob:
+          name: functest-smoke
+          condition: SUCCESSFUL
+          projects:
+            - name: 'functest-apex-virtual-suite-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                FUNCTEST_SUITE_NAME=healthcheck
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
 
 # Baremetal Deploy and Test
 - job-template:
@@ -382,18 +383,18 @@
     builders:
       - description-setter:
           description: "Testing on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
-#      - multijob:
-#          name: Functest
-#          condition: ALWAYS
-#          projects:
-#            - name: 'functest-apex-baremetal-daily-{scenario_stream}'
-#              node-parameters: true
-#              current-parameters: false
-#              predefined-parameters:
-#                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-#              kill-phase-on: NEVER
-#              abort-all-job: false
-#              git-revision: false
+      - multijob:
+          name: Functest
+          condition: ALWAYS
+          projects:
+            - name: 'functest-apex-baremetal-daily-{scenario_stream}'
+              node-parameters: true
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              kill-phase-on: NEVER
+              abort-all-job: false
+              git-revision: false
       - multijob:
           name: Yardstick
           condition: ALWAYS
@@ -612,23 +613,23 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: false
-#      - multijob:
-#          name: functest-smoke
-#          condition: SUCCESSFUL
-#          projects:
-#            - name: 'functest-apex-virtual-suite-{stream}'
-#              current-parameters: false
-#              predefined-parameters: |
-#                DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
-#                FUNCTEST_SUITE_NAME=tempest_smoke_serial
-#                GERRIT_BRANCH=$GERRIT_BRANCH
-#                GERRIT_REFSPEC=$GERRIT_REFSPEC
-#                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-#                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-#              node-parameters: true
-#              kill-phase-on: FAILURE
-#              abort-all-job: true
-#              git-revision: false
+      - multijob:
+          name: functest-smoke
+          condition: SUCCESSFUL
+          projects:
+            - name: 'functest-apex-virtual-suite-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
+                FUNCTEST_SUITE_NAME=tempest_smoke_serial
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+              git-revision: false
       - multijob:
           name: create snapshot
           condition: SUCCESSFUL
@@ -780,7 +781,7 @@
       - string:
           name: SSH_KEY
           default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex.'
+          description: 'SSH key to use for Apex'
 
     properties:
       - logrotate-default