diff --git a/Jenkinsfile b/Jenkinsfile index 767579f..ff61e7c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -435,7 +435,7 @@ if (!binding.hasVariable('quietPeriod')) { binding.setVariable('quietPeriod', 10 + buildPriority * 2) } if (!binding.hasVariable('nice')) { - def nice = (params.BuildPriority as Integer) - 1; + def nice = (params.BuildPriority == null) ? 0 : ((params.BuildPriority as Integer) - 1); if (nice < 0) nice = 0; else if (nice > 19) nice = 19; binding.setVariable('nice', nice) @@ -468,7 +468,7 @@ if (!binding.hasVariable('failureEmailTo')) { } // Common settings -def mvnCommon = "-Dstyle.color=always -Dmaven.gitcommitid.nativegit=true -DrequireLastBuild=${params.requireLastBuild} -Djenkins.buildNumber=${currentBuild.number} -N -U -Pjenkins,POST-SNAPSHOT${extraProfiles.isEmpty() ? '' : (',' + extraProfiles.join(','))}" +def mvnCommon = "-Dstyle.color=always -Dmaven.gitcommitid.nativegit=true -DrequireLastBuild=${params.requireLastBuild == null ? false : params.requireLastBuild} -Djenkins.buildNumber=${currentBuild.number} -N -U -Pjenkins,POST-SNAPSHOT${extraProfiles.isEmpty() ? '' : (',' + extraProfiles.join(','))}" def buildPhases = 'clean process-test-classes' // Determine nice command prefix or empty string for none @@ -618,7 +618,7 @@ or any build that adds or removes build artifacts.""" stage('Check Ready') { when { expression { - return params.abortOnUnreadyDependency + return (params.abortOnUnreadyDependency == null) ? true : params.abortOnUnreadyDependency } } steps { @@ -955,7 +955,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1 filter: '**/*.pom, **/*.aar, **/*.jar, **/*.war, **/*.zip', target: 'target/last-successful-artifacts', flatten: true, - optional: !params.requireLastBuild + optional: (params.requireLastBuild == null) ? true : !params.requireLastBuild ) // Temporarily move surefire-reports before withMaven to avoid duplicate logging of test results sh moveSurefireReportsScript() diff --git a/book/Jenkinsfile b/book/Jenkinsfile index 2b3d7d5..ba1b8f6 100644 --- a/book/Jenkinsfile +++ b/book/Jenkinsfile @@ -437,7 +437,7 @@ if (!binding.hasVariable('quietPeriod')) { binding.setVariable('quietPeriod', 10 + buildPriority * 2) } if (!binding.hasVariable('nice')) { - def nice = (params.BuildPriority as Integer) - 1; + def nice = (params.BuildPriority == null) ? 0 : ((params.BuildPriority as Integer) - 1); if (nice < 0) nice = 0; else if (nice > 19) nice = 19; binding.setVariable('nice', nice) @@ -470,7 +470,7 @@ if (!binding.hasVariable('failureEmailTo')) { } // Common settings -def mvnCommon = "-Dstyle.color=always -Dmaven.gitcommitid.nativegit=true -DrequireLastBuild=${params.requireLastBuild} -Djenkins.buildNumber=${currentBuild.number} -N -U -Pjenkins,POST-SNAPSHOT${extraProfiles.isEmpty() ? '' : (',' + extraProfiles.join(','))}" +def mvnCommon = "-Dstyle.color=always -Dmaven.gitcommitid.nativegit=true -DrequireLastBuild=${params.requireLastBuild == null ? false : params.requireLastBuild} -Djenkins.buildNumber=${currentBuild.number} -N -U -Pjenkins,POST-SNAPSHOT${extraProfiles.isEmpty() ? '' : (',' + extraProfiles.join(','))}" def buildPhases = 'clean process-test-classes' // Determine nice command prefix or empty string for none @@ -620,7 +620,7 @@ or any build that adds or removes build artifacts.""" stage('Check Ready') { when { expression { - return params.abortOnUnreadyDependency + return (params.abortOnUnreadyDependency == null) ? true : params.abortOnUnreadyDependency } } steps { @@ -957,7 +957,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1 filter: '**/*.pom, **/*.aar, **/*.jar, **/*.war, **/*.zip', target: 'target/last-successful-artifacts', flatten: true, - optional: !params.requireLastBuild + optional: (params.requireLastBuild == null) ? true : !params.requireLastBuild ) // Temporarily move surefire-reports before withMaven to avoid duplicate logging of test results sh moveSurefireReportsScript()