diff --git a/Jenkinsfile b/Jenkinsfile index c595efc..40eb9f2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,10 +60,6 @@ def upstreamProjects = [ * 'book/Jenkinsfile' -> 'book' * * 'devel/Jenkinsfile' -> 'devel' * * * - * abortOnUnreadyDependency Aborts the build when any dependency is queued, building, * - * or unsuccessful. * - * Defaults to true * - * * * disableSubmodules Disables checkout of Git submodules. * * Defaults to true * * * @@ -169,9 +165,6 @@ if (!binding.hasVariable('projectDir')) { } binding.setVariable('projectDir', projectDir) } -if (!binding.hasVariable('abortOnUnreadyDependency')) { - binding.setVariable('abortOnUnreadyDependency', true) -} if (!binding.hasVariable('disableSubmodules')) { binding.setVariable('disableSubmodules', true) } @@ -584,6 +577,13 @@ pipeline { defaultValue: "$buildPriority", description: """Specify the priority of this build. Defaults to project's depth in the upstream project graph.""" + ) + booleanParam( + name: 'abortOnUnreadyDependency', + defaultValue: true, + description: """Aborts the build when any dependency is queued, building, or unsuccessful. +Defaults to true and will typically only be false to push a new version of a project out immediately. +May also want to set BuildPriority to \"1\" to put at the top of the build queue.""" ) booleanParam( name: 'requireLastBuild', @@ -603,7 +603,7 @@ or any build that adds or removes build artifacts.""" stage('Check Ready') { when { expression { - return abortOnUnreadyDependency + return params.abortOnUnreadyDependency } } steps { diff --git a/all b/all index 0411d41..a44c9a0 160000 --- a/all +++ b/all @@ -1 +1 @@ -Subproject commit 0411d41e6ea06c7643efebf0612779eb8347bf87 +Subproject commit a44c9a052bbc80dcd51e9ecf79dc7c7a60bc3f8f diff --git a/bom b/bom index e923272..38441f5 160000 --- a/bom +++ b/bom @@ -1 +1 @@ -Subproject commit e923272256a8f02ae3080dec8bf600c488f1d0c1 +Subproject commit 38441f5eb0ab941b3eaa749c11c5b7cee01852f3 diff --git a/book/Jenkinsfile b/book/Jenkinsfile index 7e29cbf..c8da2fe 100644 --- a/book/Jenkinsfile +++ b/book/Jenkinsfile @@ -75,10 +75,6 @@ def upstreamProjects = [ * 'book/Jenkinsfile' -> 'book' * * 'devel/Jenkinsfile' -> 'devel' * * * - * abortOnUnreadyDependency Aborts the build when any dependency is queued, building, * - * or unsuccessful. * - * Defaults to true * - * * * disableSubmodules Disables checkout of Git submodules. * * Defaults to true * * * @@ -184,9 +180,6 @@ if (!binding.hasVariable('projectDir')) { } binding.setVariable('projectDir', projectDir) } -if (!binding.hasVariable('abortOnUnreadyDependency')) { - binding.setVariable('abortOnUnreadyDependency', true) -} if (!binding.hasVariable('disableSubmodules')) { binding.setVariable('disableSubmodules', true) } @@ -599,6 +592,13 @@ pipeline { defaultValue: "$buildPriority", description: """Specify the priority of this build. Defaults to project's depth in the upstream project graph.""" + ) + booleanParam( + name: 'abortOnUnreadyDependency', + defaultValue: true, + description: """Aborts the build when any dependency is queued, building, or unsuccessful. +Defaults to true and will typically only be false to push a new version of a project out immediately. +May also want to set BuildPriority to \"1\" to put at the top of the build queue.""" ) booleanParam( name: 'requireLastBuild', @@ -618,7 +618,7 @@ or any build that adds or removes build artifacts.""" stage('Check Ready') { when { expression { - return abortOnUnreadyDependency + return params.abortOnUnreadyDependency } } steps { diff --git a/model b/model index f7721a5..e2d89be 160000 --- a/model +++ b/model @@ -1 +1 @@ -Subproject commit f7721a534ab447fd79c7d5aadafa9b36453d3bf6 +Subproject commit e2d89be1adbff2863e4915cc4d4ae630ff25d435 diff --git a/renderer-html b/renderer-html index ce04523..1f215c6 160000 --- a/renderer-html +++ b/renderer-html @@ -1 +1 @@ -Subproject commit ce045233ec6b77cc0520b91b37614f5c14ef678d +Subproject commit 1f215c627de40eab4561ca2dd8bf0cb030ed2b45 diff --git a/servlet b/servlet index 2a8d058..ae66487 160000 --- a/servlet +++ b/servlet @@ -1 +1 @@ -Subproject commit 2a8d0581146abcb8856d039e49c07976909d2807 +Subproject commit ae6648722c62ec32b1d1fea5b95cdbdcccfdb50c diff --git a/style b/style index 46077ea..3b8c9a8 160000 --- a/style +++ b/style @@ -1 +1 @@ -Subproject commit 46077ea12be1e73ff74924d29060fd109b2a4d64 +Subproject commit 3b8c9a85b8212fcdda1867fd0376c8767b7a9d3c diff --git a/taglib b/taglib index a0db748..4780a3c 160000 --- a/taglib +++ b/taglib @@ -1 +1 @@ -Subproject commit a0db748b81ae1dda8636916a99bf5b62804b0a82 +Subproject commit 4780a3ce886ca31118db655d99bd38528b4b6b50 diff --git a/view b/view index b9a3429..ac4f640 160000 --- a/view +++ b/view @@ -1 +1 @@ -Subproject commit b9a3429dd54d2e1956426d6515df02880eda818a +Subproject commit ac4f640f3023296c1a7253e42b705f228a27cc26