From 920dbbbf9981835ae364e2233f31b39d14f5b698 Mon Sep 17 00:00:00 2001 From: Andrew Leonard <31470007+andrew-m-leonard@users.noreply.github.com> Date: Thu, 2 Nov 2023 22:32:30 +0000 Subject: [PATCH] Build jdk21u HEAD weekly (#834) * Build jdk21u HEAD weekly Signed-off-by: Andrew Leonard * Currently only jdk-22 is build tag triggered Signed-off-by: Andrew Leonard --------- Signed-off-by: Andrew Leonard --- pipelines/jobs/configurations/jdk21u.groovy | 2 +- tools/nightly_build_and_test_stats.groovy | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pipelines/jobs/configurations/jdk21u.groovy b/pipelines/jobs/configurations/jdk21u.groovy index bee5c3b66..f8bb41cf1 100644 --- a/pipelines/jobs/configurations/jdk21u.groovy +++ b/pipelines/jobs/configurations/jdk21u.groovy @@ -35,7 +35,7 @@ targetConfigurations = [ // 23:30 Mon, Wed, Fri //Uses releaseTrigger_21ea: triggerSchedule_nightly = 'TZ=UTC\n30 23 * * 1,3,5' // 23:30 Sat -//Replaced by releaseTrigger_21ea: triggerSchedule_weekly = 'TZ=UTC\n30 23 * * 6' +triggerSchedule_weekly = 'TZ=UTC\n30 23 * * 6' // scmReferences to use for weekly release build weekly_release_scmReferences = [ diff --git a/tools/nightly_build_and_test_stats.groovy b/tools/nightly_build_and_test_stats.groovy index 9c3c3f7a5..4f8a40586 100644 --- a/tools/nightly_build_and_test_stats.groovy +++ b/tools/nightly_build_and_test_stats.groovy @@ -205,7 +205,7 @@ node('worker') { // In particular, look at first data set for latest published binaries. // If no published assets happened the last 4 days, the nightly pipeline // is considered unhealthy. - // For tag triggered versions (jdk-21+) check the binary is published + // For tag triggered versions (jdk-22+) check the binary is published // The release asset list is also verified featureReleases.each { featureRelease -> def featureReleaseInt = featureRelease.replaceAll("u", "").replaceAll("jdk", "").toInteger() @@ -217,7 +217,7 @@ node('worker') { while(!foundNonEvaluationBinaries && i < assetsJson.size()) { def releaseName = assetsJson[i].release_name def status = [] - if (featureReleaseInt < 21) { + if (featureReleaseInt < 22) { def ts = assetsJson[i].timestamp // newest timestamp of a jdk asset def assetTs = Instant.parse(ts).atZone(ZoneId.of('UTC')) def now = ZonedDateTime.now(ZoneId.of('UTC')) @@ -489,8 +489,8 @@ echo 'Adoptium Latest Builds Success : *' + variant + '* => *' + overallNightlyS def releaseName = status['releaseName'] def lastPublishedMsg = "" - // jdk-21+ are latest tag triggered builds - if (featureReleaseInt < 21) { + // jdk-22+ are latest tag triggered builds + if (featureReleaseInt < 22) { // Check for stale published build def days = status['actualDays'] as int lastPublishedMsg = "\nPublished: ${days} day(s) ago." // might actually be days + N hours, where N < 24