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.

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

For JDK head, use alternate file/release name #719

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions pipelines/build/common/build_base_file.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -732,6 +731,11 @@ class Builder implements Serializable {
}

def timestamp = new Date().format('yyyy-MM-dd-HH-mm', TimeZone.getTimeZone('UTC'))
if (javaToBuild == "jdk${headVersion}") {
timestamp = timestamp = "ea." + "${scmReference}".replaceFirst("jdk-","").replaceFirst("_adopt","").replaceAll("[.+]","-");
} else {
timestamp = new Date().format('yyyy-MM-dd-HH-mm', TimeZone.getTimeZone('UTC'))
}
def tag = "${javaToBuild}-${timestamp}"

if (publishName) {
Expand Down