From: Aric Gardner <agardner@linuxfoundation.org>
Date: Mon, 31 Jul 2017 14:58:15 +0000 (+0000)
Subject: Merge "Apex: changes build result using groovy-postbuild"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=55667d21f12f21317d52cb8b3b753ea92a037ccc;hp=0c27ec09e767e609e4ed2359f7ad966e64423922;p=releng.git

Merge "Apex: changes build result using groovy-postbuild"
---

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index f18fe4041..f47775f61 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -752,6 +752,20 @@
             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"'
+
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw-escape: ./update-build-result.groovy
 
 
 # danube Daily
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index d7b67c344..a3cc9c658 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -694,6 +694,20 @@
             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"'
+
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw-escape: ./update-build-result.groovy
 
 {% for stream in scenarios %}
 # {{ stream }} Daily
diff --git a/jjb/apex/update-build-result.groovy b/jjb/apex/update-build-result.groovy
new file mode 100644
index 000000000..a569e51f8
--- /dev/null
+++ b/jjb/apex/update-build-result.groovy
@@ -0,0 +1,4 @@
+import hudson.model.*
+if (manager.build.@result == hudson.model.Result.FAILURE) {
+    manager.build.@result = hudson.model.Result.UNSTABLE
+}