Skip to content

Commit

Permalink
Change default activeNodeTimeout from 0 to 1 min (adoptium#853)
Browse files Browse the repository at this point in the history
* Change default activeNodeTimeout from 0 to 1 min

Signed-off-by: Shelley Lambert <[email protected]>

* Update template

Signed-off-by: Shelley Lambert <[email protected]>

---------

Signed-off-by: Shelley Lambert <[email protected]>
  • Loading branch information
smlambert authored and luhenry committed Feb 3, 2024
1 parent 96adbde commit 3a7e62a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pipelines/build/prTester/pr_test_pipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ class PullRequestTestPipeline implements Serializable {
propagate: true,
parameters: [
context.string(name: 'releaseType', value: 'Nightly Without Publish'),
context.string(name: 'activeNodeTimeout', value: '0'),
context.string(name: 'activeNodeTimeout', value: '1'),
context.string(name: 'ciReference', value: "${branch}"), // use PR's SHA1 for the generated openjdkX-pipeline
context.booleanParam(name: 'enableTestDynamicParallel', value: false), // not needed unless we enable test
context.booleanParam(name: 'enableInstallers', value: false), // never need this enabled in pr-test
Expand Down
2 changes: 1 addition & 1 deletion pipelines/jobs/pipeline_job_template.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ pipelineJob("${BUILD_FOLDER}/${JOB_NAME}") {

parameters {
textParam('targetConfigurations', JsonOutput.prettyPrint(JsonOutput.toJson(targetConfigurations)))
stringParam('activeNodeTimeout', '0', 'Number of minutes we will wait for a label-matching node to become active.')
stringParam('activeNodeTimeout', '1', 'Number of minutes we will wait for a label-matching node to become active.')
stringParam('jdkVersion', jdkVersion, 'The JDK version of the pipeline e.g (8, 11, 17).')
stringParam('dockerExcludes', '', 'Map of targetConfigurations to exclude from docker building. If a targetConfiguration (i.e. { "x64LinuxXL": [ "openj9" ], "aarch64Linux": [ "hotspot", "openj9" ] }) has been entered into this field, jenkins will build the jdk without using docker. This param overrides the dockerImage and dockerFile downstream job parameters.')
stringParam('baseFilePath', '', "Relative path to where the build_base_file.groovy file is located. This runs the downstream job setup and configuration retrieval services.<br>Default: <code>${defaultsJson['baseFileDirectories']['upstream']}</code>")
Expand Down
2 changes: 1 addition & 1 deletion pipelines/jobs/release_pipeline_job_template.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pipelineJob("${BUILD_FOLDER}/${JOB_NAME}") {

// default value not matter for release
stringParam('jdkVersion', "${JAVA_VERSION}")
stringParam('activeNodeTimeout', '0', 'Number of minutes we will wait for a label-matching node to become active.')
stringParam('activeNodeTimeout', '1', 'Number of minutes we will wait for a label-matching node to become active.')
stringParam('dockerExcludes', '', 'Map of targetConfigurations to exclude from docker building. If a targetConfiguration (i.e. { "x64LinuxXL": [ "openj9" ], "aarch64Linux": [ "hotspot", "openj9" ] }) has been entered into this field, jenkins will build the jdk without using docker. This param overrides the dockerImage and dockerFile downstream job parameters.')
stringParam('baseFilePath', '', "Relative path to where the build_base_file.groovy file is located. This runs the downstream job setup and configuration retrieval services.<br>Default: <code>${defaultsJson['baseFileDirectories']['upstream']}</code>")
stringParam('buildConfigFilePath', '', "Relative path to where the jdkxx_pipeline_config.groovy file is located. It contains the build configurations for each platform, architecture and variant.<br>Default: <code>${defaultsJson['configDirectories']['build']}/jdkxx_pipeline_config.groovy</code>")
Expand Down

0 comments on commit 3a7e62a

Please sign in to comment.