Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ao-apps
ao-apps committed Oct 8, 2023
2 parents e7676b5 + 78fe33a commit af85310
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 12 deletions.
10 changes: 6 additions & 4 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,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' *
Expand Down Expand Up @@ -454,8 +454,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')) {
Expand Down Expand Up @@ -608,6 +609,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(
Expand Down
10 changes: 6 additions & 4 deletions book/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,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' *
Expand Down Expand Up @@ -449,8 +449,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')) {
Expand Down Expand Up @@ -603,6 +604,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(
Expand Down
10 changes: 6 additions & 4 deletions devel/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,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' *
Expand Down Expand Up @@ -425,8 +425,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')) {
Expand Down Expand Up @@ -579,6 +580,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(
Expand Down

0 comments on commit af85310

Please sign in to comment.