From c4389699b96210661098704b45ff1813b0f62ccb Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Fri, 9 Jun 2023 10:36:04 +0100 Subject: [PATCH 1/2] For JDK head, use alternate file/release name Signed-off-by: Stewart X Addison --- pipelines/build/common/build_base_file.groovy | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index 78650278f..daae911a3 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -732,6 +732,11 @@ class Builder implements Serializable { } def timestamp = new Date().format('yyyy-MM-dd-HH-mm', TimeZone.getTimeZone('UTC')) + if (javaToBuild == "jdk${headVersion}") { + timestamp = "ea.${scmReference}".replaceAll("jdk-","").replaceAll("_adopt","").replaceAll("/\.\+/",""); + } else { + timestamp = new Date().format('yyyy-MM-dd-HH-mm', TimeZone.getTimeZone('UTC')) + } def tag = "${javaToBuild}-${timestamp}" if (publishName) { From d58b6d2c94c2785897340f38d4d48eec65989c3b Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Fri, 9 Jun 2023 11:00:36 +0100 Subject: [PATCH 2/2] Unexpected linter fix Signed-off-by: Stewart X Addison --- pipelines/build/common/build_base_file.groovy | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index daae911a3..aa864e858 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -664,7 +664,6 @@ class Builder implements Serializable { return "jdk${number}" } - /* Returns the downstream build job's type by checking job folder's path can be "evaluation" or "release" or null (in this case it is for the nightly or pr-tester) @@ -689,7 +688,7 @@ class Builder implements Serializable { /* Returns the jenkins folder of where we assume the downstream build jobs have been regenerated - e.g: + e.g: nightly: build-scripts/jobs/jdk11u/jdk11u-linux-aarch64-temurin evaluation: build-scripts/jobs/evaluation/jobs/jdk17u/jdk17u-evaluation-mac-x64-openj9 release: build-scripts/jobs/release/jobs/jdk20/jdk20-release-aix-ppc64-temurin @@ -733,7 +732,7 @@ class Builder implements Serializable { def timestamp = new Date().format('yyyy-MM-dd-HH-mm', TimeZone.getTimeZone('UTC')) if (javaToBuild == "jdk${headVersion}") { - timestamp = "ea.${scmReference}".replaceAll("jdk-","").replaceAll("_adopt","").replaceAll("/\.\+/",""); + timestamp = timestamp = "ea." + "${scmReference}".replaceFirst("jdk-","").replaceFirst("_adopt","").replaceAll("[.+]","-"); } else { timestamp = new Date().format('yyyy-MM-dd-HH-mm', TimeZone.getTimeZone('UTC')) }