Merge branch 'stable-2.16' into stable-3.0
* stable-2.16: Jenkinsfile: Always build java sources if WORKSPACE file changed Change-Id: Ic8232adf53cf287b9cc8db32ea5487d2ce5b923a
This commit is contained in:
5
Jenkinsfile
vendored
5
Jenkinsfile
vendored
@@ -139,7 +139,7 @@ def collectBuildModes() {
|
|||||||
def polygerritFiles = changedFiles.findAll { it.startsWith("polygerrit-ui") ||
|
def polygerritFiles = changedFiles.findAll { it.startsWith("polygerrit-ui") ||
|
||||||
it.startsWith("lib/js") }
|
it.startsWith("lib/js") }
|
||||||
|
|
||||||
if(polygerritFiles.size() > 0 || changedFiles.contains("WORKSPACE")) {
|
if(polygerritFiles.size() > 0) {
|
||||||
if(changedFiles.size() == polygerritFiles.size()) {
|
if(changedFiles.size() == polygerritFiles.size()) {
|
||||||
println "Only PolyGerrit UI changes detected, skipping other test modes..."
|
println "Only PolyGerrit UI changes detected, skipping other test modes..."
|
||||||
Builds.modes = ["polygerrit"]
|
Builds.modes = ["polygerrit"]
|
||||||
@@ -147,6 +147,9 @@ def collectBuildModes() {
|
|||||||
println "PolyGerrit UI changes detected, adding 'polygerrit' validation..."
|
println "PolyGerrit UI changes detected, adding 'polygerrit' validation..."
|
||||||
Builds.modes += "polygerrit"
|
Builds.modes += "polygerrit"
|
||||||
}
|
}
|
||||||
|
} else if(changedFiles.contains("WORKSPACE")) {
|
||||||
|
println "WORKSPACE file changes detected, adding 'polygerrit' validation..."
|
||||||
|
Builds.modes += "polygerrit"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user