X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml;h=e19a90e94bb985b02e2b04b04a9d771d33a4e539;hb=5af2914b837c9559d04c83d7db3f9eb061e47118;hp=4228734d6f3c3269b59086647a44fdec9e0aa04c;hpb=3dda8300a72a04c5630939d5ae16ac4fc5d2d6ec;p=releng.git

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 4228734d6..e19a90e94 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -26,7 +26,7 @@
           baremetal-slave: 'apex-baremetal-master'
           verify-scenario: 'os-odl-nofeature-ha'
           scenario_stream: 'master'
-          disable_daily: true
+          disable_daily: false
       - euphrates: &euphrates
           branch: 'stable/euphrates'
           gs-pathname: '/euphrates'
@@ -35,7 +35,7 @@
           baremetal-slave: 'apex-baremetal-master'
           verify-scenario: 'os-odl-nofeature-ha'
           scenario_stream: 'euphrates'
-          disable_daily: false
+          disable_daily: true
       - danube: &danube
           branch: 'stable/danube'
           gs-pathname: '/danube'
@@ -110,37 +110,35 @@
           <<: *master
       - 'os-odl-bgpvpn-ha':
           <<: *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
@@ -158,10 +156,6 @@
           <<: *euphrates
       - 'os-nosdn-fdio-ha':
           <<: *euphrates
-      - 'os-odl-fdio-noha':
-          <<: *euphrates
-      - 'os-odl-fdio-ha':
-          <<: *euphrates
       - 'os-nosdn-bar-ha':
           <<: *euphrates
       - 'os-nosdn-bar-noha':
@@ -180,10 +174,6 @@
           <<: *euphrates
       - 'os-odl-sfc-ha':
           <<: *euphrates
-      - 'os-odl-fdio_dvr-noha':
-          <<: *euphrates
-      - 'os-odl-fdio_dvr-ha':
-          <<: *euphrates
       - 'os-nosdn-calipso-noha':
           <<: *euphrates
 
@@ -261,8 +251,6 @@
 - job-template:
     name: 'apex-deploy-{platform}-{stream}'
 
-    node: 'apex-{platform}-{stream}'
-
     concurrent: true
 
     disabled: false
@@ -323,6 +311,8 @@
 
     project-type: 'multijob'
 
+    concurrent: true
+
     disabled: false
 
     scm:
@@ -540,7 +530,7 @@
               abort-all-job: false
               git-revision: false
       - multijob:
-          name: Dovetail
+          name: Dovetail-proposed_tests
           condition: ALWAYS
           projects:
             - name: 'dovetail-apex-baremetal-proposed_tests-{scenario_stream}'
@@ -549,7 +539,22 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/
+                                 && $BUILD_NUMBER % 2 == 1"
+              abort-all-job: false
+              git-revision: false
+      - multijob:
+          name: Dovetail-default
+          condition: ALWAYS
+          projects:
+            - name: 'dovetail-apex-baremetal-default-{scenario_stream}'
+              node-parameters: true
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              kill-phase-on: NEVER
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/
+                                 && $BUILD_NUMBER % 2 == 0"
               abort-all-job: false
               git-revision: false
       - multijob:
@@ -585,8 +590,6 @@
     #     branch:    branch (eg. stable)
     project-type: 'multijob'
 
-    node: '{baremetal-slave}'
-
     disabled: '{obj:disable_daily}'
 
     scm:
@@ -1341,7 +1344,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-ovn-nofeature-noha-baremetal-master'
+            - name: 'apex-os-odl-bgpvpn-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1349,7 +1352,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-fdio-noha-baremetal-master'
+            - name: 'apex-os-odl-sriov-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1357,7 +1360,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-fdio-ha-baremetal-master'
+            - name: 'apex-os-odl-ovs_offload-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1365,7 +1368,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-fdio-noha-baremetal-master'
+            - name: 'apex-os-ovn-nofeature-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1373,7 +1376,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-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1381,7 +1384,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-bar-ha-baremetal-master'
+            - name: 'apex-os-nosdn-fdio-ha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1389,7 +1392,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-bar-noha-baremetal-master'
+            - name: 'apex-os-nosdn-bar-ha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1397,7 +1400,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-master'
+            - name: 'apex-os-nosdn-bar-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1421,7 +1424,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: |
@@ -1429,7 +1432,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: |
@@ -1453,15 +1456,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: |
@@ -1542,22 +1537,6 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-fdio-noha-baremetal-euphrates'
-              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-ha-baremetal-euphrates'
-              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-bar-ha-baremetal-euphrates'
               node-parameters: false
               current-parameters: false
@@ -1630,22 +1609,6 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-fdio_dvr-noha-baremetal-euphrates'
-              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-euphrates'
-              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-calipso-noha-baremetal-euphrates'
               node-parameters: false
               current-parameters: false
@@ -1678,12 +1641,12 @@
 - trigger:
     name: 'apex-master'
     triggers:
-      - timed: '0 3 1 1 7'
+      - timed: '0 0 1-31/2 * *'
 
 - trigger:
     name: 'apex-euphrates'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 0 2-30/2 * *'
 
 - trigger:
     name: 'apex-danube'