From d07cc6ad4a4e4a434b010a69552d48b3581fffb9 Mon Sep 17 00:00:00 2001 From: Stewart X Addison <6487691+sxa@users.noreply.github.com> Date: Thu, 22 Jun 2023 15:42:10 +0100 Subject: [PATCH] Disable JDK21 nightlies, set Weekly builds to not publish (#736) * Disable nightly builds as they are superceded by ea Signed-off-by: Stewart X Addison * Disable nightly JDK21 builds, set weeklies to not publish Signed-off-by: Stewart X Addison --------- Signed-off-by: Stewart X Addison --- pipelines/build/common/build_base_file.groovy | 3 ++- pipelines/jobs/configurations/jdk21.groovy | 2 +- pipelines/jobs/configurations/jdk21_evaluation.groovy | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index 8f197715d..c398d6b35 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -760,15 +760,16 @@ class Builder implements Serializable { def timestamp = new Date().format('yyyy-MM-dd-HH-mm', TimeZone.getTimeZone('UTC')) def tag = "${javaToBuild}-${timestamp}" - if (publishName) { tag = publishName } + context.stage('publish') { context.build job: 'build-scripts/release/refactor_openjdk_release_tool', parameters: [ ['$class': 'BooleanParameterValue', name: 'RELEASE', value: release], + ['$class': 'BooleanParameterValue', name: 'DRY_RUN', value: (isWeekly ? true : false)], context.string(name: 'TAG', value: tag), context.string(name: 'TIMESTAMP', value: timestamp), context.string(name: 'UPSTREAM_JOB_NAME', value: env.JOB_NAME), diff --git a/pipelines/jobs/configurations/jdk21.groovy b/pipelines/jobs/configurations/jdk21.groovy index ff1e225da..f0152c0ce 100644 --- a/pipelines/jobs/configurations/jdk21.groovy +++ b/pipelines/jobs/configurations/jdk21.groovy @@ -33,7 +33,7 @@ targetConfigurations = [ ] // 23:30 Mon, Wed, Fri -triggerSchedule_nightly = 'TZ=UTC\n30 23 * * 1,3,5' +// triggerSchedule_nightly = 'TZ=UTC\n30 23 * * 1,3,5' // 23:30 Sat triggerSchedule_weekly = 'TZ=UTC\n30 23 * * 6' diff --git a/pipelines/jobs/configurations/jdk21_evaluation.groovy b/pipelines/jobs/configurations/jdk21_evaluation.groovy index efd53f2c9..87adc6d94 100644 --- a/pipelines/jobs/configurations/jdk21_evaluation.groovy +++ b/pipelines/jobs/configurations/jdk21_evaluation.groovy @@ -13,7 +13,7 @@ targetConfigurations = [ // if set to empty string then it wont get triggered // 23:40 Mon, Wed -triggerSchedule_evaluation = 'TZ=UTC\n40 23 * * 1,3' +// triggerSchedule_evaluation = 'TZ=UTC\n40 23 * * 1,3' // 23:40 Sat triggerSchedule_weekly_evaluation = 'TZ=UTC\n40 23 * * 6'