X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml;h=587a06377a02f3ea1d41b7f7e75376e1a7474a36;hb=d29c3e495aee81b96f653b6a4b5ee72a9bf33976;hp=ed7ba7544a8df2258a62efd5e20a8e43da383ee5;hpb=979cef911006bde631ac28f7154b3db082d10ef5;p=releng.git

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index ed7ba7544..587a06377 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -3,6 +3,7 @@
     name: 'apex'
     project: 'apex'
     jobs:
+      - 'apex-fetch-logs-{stream}'
       - 'apex-runner-cperf-{stream}'
       - 'apex-virtual-{stream}'
       - 'apex-deploy-{platform}-{stream}'
@@ -36,7 +37,7 @@
           baremetal-slave: 'apex-baremetal-master'
           verify-scenario: 'os-odl-nofeature-ha'
           scenario_stream: 'fraser'
-          disable_daily: true
+          disable_daily: false
           disable_promote: true
       - euphrates: &euphrates
           branch: 'stable/euphrates'
@@ -81,16 +82,10 @@
           <<: *fraser
       - 'os-nosdn-bar-noha':
           <<: *fraser
-      - 'os-nosdn-nofeature-ha-ipv6':
-          <<: *fraser
       - 'os-nosdn-ovs_dpdk-noha':
           <<: *fraser
       - 'os-nosdn-ovs_dpdk-ha':
           <<: *fraser
-      - 'os-nosdn-kvm_ovs_dpdk-noha':
-          <<: *fraser
-      - 'os-nosdn-kvm_ovs_dpdk-ha':
-          <<: *fraser
       - 'os-odl-sfc-noha':
           <<: *fraser
       - 'os-odl-sfc-ha':
@@ -149,45 +144,9 @@
           <<: *danube
       - 'os-ovn-nofeature-noha':
           <<: *danube
-      - 'os-nosdn-nofeature-noha':
-          <<: *master
-      - 'os-nosdn-nofeature-ha':
-          <<: *master
-      - 'os-odl-nofeature-ha':
+      - 'os-odl-master_upstream-noha':
           <<: *master
-      - 'os-odl-nofeature-noha':
-          <<: *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-nosdn-bar-ha':
-          <<: *master
-      - 'os-nosdn-bar-noha':
-          <<: *master
-      - 'os-nosdn-ovs_dpdk-noha':
-          <<: *master
-      - 'os-nosdn-ovs_dpdk-ha':
-          <<: *master
-      - 'os-odl-ovs_dpdk-noha':
-          <<: *master
-      - 'os-odl-ovs_dpdk-ha':
-          <<: *master
-      - 'os-odl-sfc-noha':
-          <<: *master
-      - 'os-odl-sfc-ha':
-          <<: *master
-      - 'os-nosdn-calipso-noha':
+      - 'os-odl-queens_upstream-noha':
           <<: *master
       - 'os-nosdn-nofeature-noha':
           <<: *euphrates
@@ -246,7 +205,6 @@
     scm:
       - git-scm-gerrit
     parameters:
-      - '{project}-{platform}-{stream}-defaults'
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
@@ -456,7 +414,7 @@
               git-revision: true
       - multijob:
           name: functest-smoke
-          condition: SUCCESSFUL
+          condition: ALWAYS
           projects:
             - name: 'functest-apex-virtual-suite-{stream}'
               current-parameters: false
@@ -473,7 +431,6 @@
               git-revision: false
       - multijob:
           name: apex-fetch-logs
-          condition: ALWAYS
           projects:
             - name: 'apex-fetch-logs-{stream}'
               current-parameters: false
@@ -533,6 +490,7 @@
       - multijob:
           name: 'Baremetal Deploy'
           condition: SUCCESSFUL
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'apex-deploy-baremetal-{scenario_stream}'
               node-parameters: true
@@ -542,11 +500,21 @@
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-fetch-logs-{scenario_stream}'
+              current-parameters: true
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=
+              node-parameters: true
+              kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
       - multijob:
           name: 'OPNFV Test Suite'
+          condition: ALWAYS
           projects:
             - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
               node-parameters: true
@@ -558,9 +526,8 @@
               git-revision: false
       - multijob:
           name: apex-fetch-logs
-          condition: ALWAYS
           projects:
-            - name: 'apex-fetch-logs'
+            - name: 'apex-fetch-logs-{scenario_stream}'
               current-parameters: true
               predefined-parameters: |
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -1261,14 +1228,6 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-fraser'
-              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-fraser'
               node-parameters: false
               current-parameters: false
@@ -1285,22 +1244,6 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-kvm_ovs_dpdk-noha-baremetal-fraser'
-              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-kvm_ovs_dpdk-ha-baremetal-fraser'
-              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-sfc-noha-baremetal-fraser'
               node-parameters: false
               current-parameters: false
@@ -1551,151 +1494,7 @@
           name: Baremetal Deploy and Test Phase
           condition: SUCCESSFUL
           projects:
-            - name: 'apex-os-nosdn-nofeature-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-nosdn-nofeature-ha-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-nofeature-ha-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-nofeature-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-bgpvpn-ha-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-bgpvpn-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-sriov-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-ovs_offload-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-ovn-nofeature-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-nosdn-fdio-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-nosdn-fdio-ha-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-bar-ha-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-bar-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-nosdn-ovs_dpdk-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-nosdn-ovs_dpdk-ha-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-ovs_dpdk-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-ovs_dpdk-ha-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-sfc-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-sfc-ha-baremetal-master'
+            - name: 'apex-os-odl-master_upstream-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
@@ -1703,7 +1502,7 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-calipso-noha-baremetal-master'
+            - name: 'apex-os-odl-queens_upstream-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |