From c4a8e21433aa7745159fd14fbeaa7be733e691fb Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Mon, 29 Jan 2024 15:13:32 +0000 Subject: [PATCH] Increase node wait timeout to 5mins to allow for Cloud provisioned VMs to come online Signed-off-by: Andrew Leonard --- pipelines/build/prTester/pr_test_pipeline.groovy | 2 +- pipelines/jobs/pipeline_job_template.groovy | 2 +- pipelines/jobs/release_pipeline_job_template.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pipelines/build/prTester/pr_test_pipeline.groovy b/pipelines/build/prTester/pr_test_pipeline.groovy index 83781a1c0..5962c154f 100644 --- a/pipelines/build/prTester/pr_test_pipeline.groovy +++ b/pipelines/build/prTester/pr_test_pipeline.groovy @@ -157,7 +157,7 @@ class PullRequestTestPipeline implements Serializable { propagate: true, parameters: [ context.string(name: 'releaseType', value: 'Nightly Without Publish'), - context.string(name: 'activeNodeTimeout', value: '1'), + context.string(name: 'activeNodeTimeout', value: '5'), 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 diff --git a/pipelines/jobs/pipeline_job_template.groovy b/pipelines/jobs/pipeline_job_template.groovy index c579a998b..63aeb9dd1 100644 --- a/pipelines/jobs/pipeline_job_template.groovy +++ b/pipelines/jobs/pipeline_job_template.groovy @@ -91,7 +91,7 @@ pipelineJob("${BUILD_FOLDER}/${JOB_NAME}") { parameters { textParam('targetConfigurations', JsonOutput.prettyPrint(JsonOutput.toJson(targetConfigurations))) - stringParam('activeNodeTimeout', '1', 'Number of minutes we will wait for a label-matching node to become active.') + stringParam('activeNodeTimeout', '5', '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.
Default: ${defaultsJson['baseFileDirectories']['upstream']}") diff --git a/pipelines/jobs/release_pipeline_job_template.groovy b/pipelines/jobs/release_pipeline_job_template.groovy index e5b7c1396..32d936745 100644 --- a/pipelines/jobs/release_pipeline_job_template.groovy +++ b/pipelines/jobs/release_pipeline_job_template.groovy @@ -74,7 +74,7 @@ pipelineJob("${BUILD_FOLDER}/${JOB_NAME}") { // default value not matter for release stringParam('jdkVersion', "${JAVA_VERSION}") - stringParam('activeNodeTimeout', '1', 'Number of minutes we will wait for a label-matching node to become active.') + stringParam('activeNodeTimeout', '5', '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.
Default: ${defaultsJson['baseFileDirectories']['upstream']}") 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.
Default: ${defaultsJson['configDirectories']['build']}/jdkxx_pipeline_config.groovy")