X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml.j2;h=5141eade5c23bc548b8478b21244e01f800d5956;hb=64f150ecdd4055f4b3f817b204fee04d9527386b;hp=b9cbd0240235a8888ea1740b726fed1ddd376e25;hpb=ed07f0df576cd775acc9b14ef4356732a109d82b;p=releng.git

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index b9cbd0240..5141eade5 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -166,7 +166,6 @@
           block-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
-            - 'functest.*'
             - 'yardstick.*'
             - 'dovetail.*'
             - 'storperf.*'
@@ -189,6 +188,8 @@
 
     project-type: 'multijob'
 
+    concurrent: true
+
     disabled: false
 
     scm:
@@ -248,23 +249,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:
@@ -381,18 +382,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
@@ -611,23 +612,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
@@ -779,7 +780,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