Merge "in swagger operation parameter supports array type"

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

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index d7b67c3..2d760f8 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -585,7 +585,7 @@
             description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
         - multijob:
             name: 'Baremetal Deploy'
-            condition: ALWAYS
+            condition: SUCCESSFUL
             projects:
                 - name: 'apex-deploy-baremetal-{scenario_stream}'
                   node-parameters: true
@@ -600,7 +600,6 @@
                   git-revision: false
         - multijob:
             name: 'OPNFV Test Suite'
-            condition: SUCCESSFUL
             projects:
                 - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
                   node-parameters: true
@@ -611,6 +610,10 @@
                   abort-all-job: true
                   git-revision: false
 
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw-escape: ./update-build-result.groovy
 
 # Baremetal test job
 - job-template:
@@ -687,13 +690,15 @@
                   enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
                   abort-all-job: false
                   git-revision: false
-        - conditional-step:
-            condition-kind: current-status
-            condition-worst: SUCCESS
-            condtion-best: SUCCESS
-            on-evaluation-failure: mark-unstable
-            steps:
-                - shell: 'echo "Tests Passed"'
+# Build status is always success due conditional plugin prefetching
+# build status before multijob phases execute
+#        - conditional-step:
+#            condition-kind: current-status
+#            condition-worst: SUCCESS
+#            condtion-best: SUCCESS
+#            on-evaluation-failure: mark-unstable
+#            steps:
+#                - shell: 'echo "Tests Passed"'
 
 {% for stream in scenarios %}
 # {{ stream }} Daily