Merge "xci: Enable Functest Healthcheck for Kubernetes scenarios"

[releng.git] / jjb / apex / apex.yml.j2

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index b0fc0d4..5965efe 100644 (file)
--- 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
@@ -389,6 +388,7 @@
               git-revision: false
       - multijob:
           name: 'OPNFV Test Suite'
+          condition: ALWAYS
           projects:
             - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
               node-parameters: true
@@ -400,7 +400,6 @@
               git-revision: false
       - multijob:
           name: apex-fetch-logs
-          condition: ALWAYS
           projects:
             - name: 'apex-fetch-logs'
               current-parameters: true