Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change default activeNodeTimeout from 0 to 1 min #853

Merged
merged 2 commits into from
Dec 7, 2023
Merged

Change default activeNodeTimeout from 0 to 1 min #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
969dc12
Change default activeNodeTimeout from 0 to 1 min
smlambert Dec 6, 2023
8e76dcf
Update template
smlambert Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pipelines/build/prTester/pr_test_pipeline.groovy
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading