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.

Sign up for GitHub

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

Special case jdk8u Solaris beta trigger #1169

Merged
merged 4 commits into from
Jan 10, 2025
Merged

Special case jdk8u Solaris beta trigger #1169

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd9edba
Special case jdk8u Solaris beta trigger
andrew-m-leonard Dec 19, 2024
7862394
Merge remote-tracking branch 'origin/master' into solaris_jdk8
andrew-m-leonard Jan 10, 2025
688716c
jdk8u Solaris betaTrigger
andrew-m-leonard Jan 10, 2025
5373570
jdk8u Solaris betaTrigger
andrew-m-leonard Jan 10, 2025
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
29 changes: 27 additions & 2 deletions pipelines/build/common/trigger_beta_build.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,12 @@ node('worker') {
} else if (mirrorRepo.contains("alpine-jdk8u")) {
// alpine-jdk8u built in its own pipeline
jdkAssetToCheck = "x64_alpine-linux"
} else if (version == 8 && mainTargetConfigurations.contains("x64Solaris")) {
// Solaris built in own pipeline
jdkAssetToCheck = "x64_solaris"
} else if (version == 8 && mainTargetConfigurations.contains("sparcv9Solaris")) {
// Solaris built in own pipeline
jdkAssetToCheck = "sparcv9_solaris"
}

echo "Checking if ${binariesRepoTag} is already published for JDK asset ${jdkAssetToCheck} ?"
Expand Down Expand Up @@ -276,10 +282,21 @@ if (triggerMainBuild || triggerEvaluationBuild) {
// Trigger pipeline builds for main & evaluation of the new build tag and publish with the "ea" tag
def jobs = [:]
def pipelines = [:]
def solarisBuildJob = false

// Trigger Main pipeline as long as we have a non-empty target configuration
if (triggerMainBuild && mainTargetConfigurations != "{}") {
pipelines["main"] = "build-scripts/openjdk${version}-pipeline"
if (version == 8 && (mainTargetConfigurations.contains("x64Solaris") || mainTargetConfigurations.contains("sparcv9Solaris"))) {
// Special case to handle building jdk8u Solaris
if (mainTargetConfigurations.contains("x64Solaris")) {
pipelines["main"] = "build-scripts/jobs/jdk8u/jdk8u-solaris-x64-temurin-simplepipe"
} else {
pipelines["main"] = "build-scripts/jobs/jdk8u/jdk8u-solaris-sparcv9-temurin-simplepipe"
}
solarisBuildJob = true
} else {
pipelines["main"] = "build-scripts/openjdk${version}-pipeline"
}
echo "main build targetConfigurations:"
echo JsonOutput.prettyPrint(mainTargetConfigurations)
}
Expand All @@ -297,14 +314,22 @@ if (triggerMainBuild || triggerEvaluationBuild) {
stage("Trigger build pipeline - ${pipeline}") {
echo "Triggering ${pipeline} for $latestAdoptTag"

def jobParams = [
def jobParams
if (solarisBuildJob) {
jobParams = [
booleanParam(name: 'RELEASE', value: false),
string(name: 'SCM_REF', value: "$latestAdoptTag"),
]
} else {
jobParams = [
string(name: 'releaseType', value: "Weekly"),
string(name: 'scmReference', value: "$latestAdoptTag"),
string(name: 'overridePublishName', value: "$publishJobTag"),
booleanParam(name: 'aqaAutoGen', value: true),
booleanParam(name: 'enableTests', value: enableTesting),
string(name: 'additionalConfigureArgs', value: "$additionalConfigureArgs")
]
}

// Specify the required targetConfigurations
if (pipeline_type == "main") {
Expand Down
Loading