X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml.j2;h=4620bbc7e0a852e247fea9830231def5deaaa84e;hb=0daa411c906dc0e052d991a84c5ef79dc54a898c;hp=b0fc0d4516220445c7ad6abfa1ac5d1fe5a842fb;hpb=9cef18bed3d594cd6c045c5a064f9914010ea2a0;p=releng.git

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index b0fc0d451..4620bbc7e 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -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'
@@ -88,7 +89,6 @@
     scm:
       - git-scm-gerrit
     parameters:
-      - '{project}-{platform}-{stream}-defaults'
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
@@ -298,7 +298,7 @@
               git-revision: true
       - multijob:
           name: functest-smoke
-          condition: SUCCESSFUL
+          condition: ALWAYS
           projects:
             - name: 'functest-apex-virtual-suite-{stream}'
               current-parameters: false
@@ -315,7 +315,6 @@
               git-revision: false
       - multijob:
           name: apex-fetch-logs
-          condition: ALWAYS
           projects:
             - name: 'apex-fetch-logs-{stream}'
               current-parameters: false
@@ -375,6 +374,7 @@
       - multijob:
           name: 'Baremetal Deploy'
           condition: SUCCESSFUL
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'apex-deploy-baremetal-{scenario_stream}'
               node-parameters: true
@@ -384,11 +384,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
@@ -400,9 +410,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