Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Jenkinsfile: Always build java sources if WORKSPACE file changed

Change-Id: Icf16c395bbb87e9b758e6435a9a1976a23754126

1 files changed, 4 insertions, 1 deletions

diff --git a/Jenkinsfile b/Jenkinsfile
index 780336458b..29a3d1584e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -139,7 +139,7 @@ def collectBuildModes() {
     def polygerritFiles = changedFiles.findAll { it.startsWith("polygerrit-ui") ||
         it.startsWith("lib/js") }
 
-    if(polygerritFiles.size() > 0 || changedFiles.contains("WORKSPACE")) {
+    if(polygerritFiles.size() > 0) {
         if(changedFiles.size() == polygerritFiles.size()) {
             println "Only PolyGerrit UI changes detected, skipping other test modes..."
             Builds.modes = ["polygerrit"]
@@ -147,6 +147,9 @@ def collectBuildModes() {
             println "PolyGerrit UI changes detected, adding 'polygerrit' validation..."
             Builds.modes += "polygerrit"
         }
+    } else if(changedFiles.contains("WORKSPACE")) {
+        println "WORKSPACE file changes detected, adding 'polygerrit' validation..."
+        Builds.modes += "polygerrit"
     }
 }