Merge remote-tracking branch 'origin/1.x'

ao-apps · Oct 8, 2023 · e4bbc82 · e4bbc82
2 parents a465f19 + 2244f45
commit e4bbc82
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -110,8 +110,8 @@ def upstreamProjects = [
  *                          10 + buildPriority * 2                                        *
  *                                                                                        *
  * nice                 The nice level to run the build processes or 0 for none.          *
- *                      Default depends on buildPriority:                                 *
- *                          min(19, buildPriority - 1)                                    *
+ *                      Default depends on params.BuildPriority:                          *
+ *                          min(19, params.BuildPriority - 1)                             *
  *                                                                                        *
  * maven                The Maven tool to use.                                            *
  *                      Defaults to 'maven-3'                                             *
@@ -435,8 +435,9 @@ if (!binding.hasVariable('quietPeriod')) {
   binding.setVariable('quietPeriod', 10 + buildPriority * 2)
 }
 if (!binding.hasVariable('nice')) {
-  def nice = buildPriority - 1;
-  if (nice > 19) nice = 19;
+  def nice = (params.BuildPriority as Integer) - 1;
+  if (nice < 0) nice = 0;
+  else if (nice > 19) nice = 19;
   binding.setVariable('nice', nice)
 }
 if (!binding.hasVariable('maven')) {
@@ -589,6 +590,7 @@ pipeline {
       name: 'BuildPriority',
       defaultValue: "$buildPriority",
       description: """Specify the priority of this build.
+Must be between 1 and 30, with lower values built first.
 Defaults to project's depth in the upstream project graph."""
     )
     booleanParam(

diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -116,8 +116,8 @@ def upstreamProjects = [
  *                          10 + buildPriority * 2                                        *
  *                                                                                        *
  * nice                 The nice level to run the build processes or 0 for none.          *
- *                      Default depends on buildPriority:                                 *
- *                          min(19, buildPriority - 1)                                    *
+ *                      Default depends on params.BuildPriority:                          *
+ *                          min(19, params.BuildPriority - 1)                             *
  *                                                                                        *
  * maven                The Maven tool to use.                                            *
  *                      Defaults to 'maven-3'                                             *
@@ -441,8 +441,9 @@ if (!binding.hasVariable('quietPeriod')) {
   binding.setVariable('quietPeriod', 10 + buildPriority * 2)
 }
 if (!binding.hasVariable('nice')) {
-  def nice = buildPriority - 1;
-  if (nice > 19) nice = 19;
+  def nice = (params.BuildPriority as Integer) - 1;
+  if (nice < 0) nice = 0;
+  else if (nice > 19) nice = 19;
   binding.setVariable('nice', nice)
 }
 if (!binding.hasVariable('maven')) {
@@ -595,6 +596,7 @@ pipeline {
       name: 'BuildPriority',
       defaultValue: "$buildPriority",
       description: """Specify the priority of this build.
+Must be between 1 and 30, with lower values built first.
 Defaults to project's depth in the upstream project graph."""
     )
     booleanParam(