Skip to content

[Build] Fix nightly build TP and drop unused upstream trigger handling #3651

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

Merged
cdietrich merged 1 commit into from
Mar 13, 2026
Merged

[Build] Fix nightly build TP and drop unused upstream trigger handling #3651

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 3 additions & 29 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pipeline {

triggers {
parameterizedCron(env.BRANCH_NAME == 'main' ? '''
H H(0-1) * * * %TARGET_PLATFORM=r202403;JDK_VERSION=21
H H(0-1) * * * %TARGET_PLATFORM=r202512;JDK_VERSION=21
H H(3-4) * * * %TARGET_PLATFORM=latest;JDK_VERSION=25
''' : '')
}
Expand Down Expand Up @@ -72,7 +72,7 @@ pipeline {
export JAVA_${javaVersion()}_HOME=''
jdkEnvVar='JAVA_HOME'
fi
./full-build.sh --tp=${selectedTargetPlatform()} \
./full-build.sh --tp=${params.TARGET_PLATFORM} \
-Pstrict-jdk-${javaVersion()} -Dtoolchain.jdk.env=\${jdkEnvVar}
"""
}
Expand Down Expand Up @@ -146,17 +146,12 @@ def javaVersion() {
return Integer.parseInt(params.JDK_VERSION)
}

/** returns true when this build was triggered by an upstream build */
def isTriggeredByUpstream() {
return !"[]".equals(currentBuild.getBuildCauses('org.jenkinsci.plugins.workflow.support.steps.build.BuildUpstreamCause').toString())
}

/**
* Returns the Eclipse version dependent on the selected target platform.
* Result: '4.XX'
*/
def eclipseVersion() {
def targetPlatform = selectedTargetPlatform()
def targetPlatform = params.TARGET_PLATFORM
if (targetPlatform == 'latest') {
return "4.40"
} else {
Expand All @@ -167,24 +162,3 @@ def eclipseVersion() {
return "4."+ (8+(monthsBetween/3))
}
}

/**
* The target platform is primarily defined by the build parameter TARGET_PLATFORM.
* But when the build is triggered by upstream with at least Java version 21, 'latest'
* is returned.
*/
def selectedTargetPlatform() {
def tp = params.TARGET_PLATFORM
def isUpstream = isTriggeredByUpstream()
def javaVersion = javaVersion()

if (isTriggeredByUpstream() && javaVersion>=25) {
println("Choosing 'latest' target since this build was triggered by upstream with Java ${javaVersion}")
return 'latest'
} else if (isTriggeredByUpstream() && javaVersion>=21) {
println("Choosing 'r2025-12' target since this build was triggered by upstream with Java ${javaVersion}")
return 'r2025-12'
} else {
return tp
}
}
Loading