X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml;h=76f4bae4109fc637ca5860eb311a1340544c1f6e;hb=64f150ecdd4055f4b3f817b204fee04d9527386b;hp=6714d6a66b51fc017001b22a3cb0e61e72584c7b;hpb=b6d433bf86cc2eeea568b5b9b52f30b8826baed3;p=releng.git

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 6714d6a66..76f4bae41 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -112,37 +112,33 @@
           <<: *master
       - 'os-odl-bgpvpn-noha':
           <<: *master
+      - 'os-odl-sriov-noha':
+          <<: *master
+      - 'os-odl-ovs_offload-noha':
+          <<: *master
       - 'os-ovn-nofeature-noha':
           <<: *master
       - 'os-nosdn-fdio-noha':
           <<: *master
       - 'os-nosdn-fdio-ha':
           <<: *master
-      - 'os-odl-fdio-noha':
-          <<: *master
-      - 'os-odl-fdio-ha':
-          <<: *master
       - 'os-nosdn-bar-ha':
           <<: *master
       - 'os-nosdn-bar-noha':
           <<: *master
-      - 'os-nosdn-nofeature-ha-ipv6':
-          <<: *master
       - 'os-nosdn-ovs_dpdk-noha':
           <<: *master
       - 'os-nosdn-ovs_dpdk-ha':
           <<: *master
-      - 'os-nosdn-kvm_ovs_dpdk-noha':
+      - 'os-odl-ovs_dpdk-noha':
           <<: *master
-      - 'os-nosdn-kvm_ovs_dpdk-ha':
+      - 'os-odl-ovs_dpdk-ha':
           <<: *master
       - 'os-odl-sfc-noha':
           <<: *master
       - 'os-odl-sfc-ha':
           <<: *master
-      - 'os-odl-fdio_dvr-noha':
-          <<: *master
-      - 'os-odl-fdio_dvr-ha':
+      - 'os-nosdn-calipso-noha':
           <<: *master
       - 'os-nosdn-nofeature-noha':
           <<: *euphrates
@@ -255,8 +251,6 @@
 - job-template:
     name: 'apex-deploy-{platform}-{stream}'
 
-    node: 'apex-{platform}-{stream}'
-
     concurrent: true
 
     disabled: false
@@ -294,7 +288,6 @@
           block-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
-            - 'functest.*'
             - 'yardstick.*'
             - 'dovetail.*'
             - 'storperf.*'
@@ -315,10 +308,10 @@
 - job-template:
     name: 'apex-virtual-{stream}'
 
-    node: 'apex-virtual-master'
-
     project-type: 'multijob'
 
+    concurrent: true
+
     disabled: false
 
     scm:
@@ -378,23 +371,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:
@@ -511,18 +504,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
@@ -581,8 +574,6 @@
     #     branch:    branch (eg. stable)
     project-type: 'multijob'
 
-    node: '{baremetal-slave}'
-
     disabled: '{obj:disable_daily}'
 
     scm:
@@ -743,23 +734,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
@@ -911,7 +902,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
@@ -1345,7 +1336,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-ovn-nofeature-noha-baremetal-master'
+            - name: 'apex-os-odl-sriov-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1353,7 +1344,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-fdio-noha-baremetal-master'
+            - name: 'apex-os-odl-ovs_offload-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1361,7 +1352,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-fdio-ha-baremetal-master'
+            - name: 'apex-os-ovn-nofeature-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1369,7 +1360,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-fdio-noha-baremetal-master'
+            - name: 'apex-os-nosdn-fdio-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1377,7 +1368,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-fdio-ha-baremetal-master'
+            - name: 'apex-os-nosdn-fdio-ha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1401,14 +1392,6 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
             - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
@@ -1425,7 +1408,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-kvm_ovs_dpdk-noha-baremetal-master'
+            - name: 'apex-os-odl-ovs_dpdk-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1433,7 +1416,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-kvm_ovs_dpdk-ha-baremetal-master'
+            - name: 'apex-os-odl-ovs_dpdk-ha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1457,15 +1440,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-fdio_dvr-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-fdio_dvr-ha-baremetal-master'
+            - name: 'apex-os-nosdn-calipso-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |