Skip to content

Commit

Permalink
Correct handling of pull request builds for z/OS
Browse files Browse the repository at this point in the history
Remove "-zos" suffix before checking whether the version is "next".

Signed-off-by: Keith W. Campbell <[email protected]>
  • Loading branch information
keithc-ca committed Jan 6, 2025
1 parent a32dd87 commit 42f5da0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions buildenv/jenkins/common/pipeline-functions.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -726,13 +726,13 @@ def setup_pull_request_single_comment(parsedComment) {
case ~/.*openj9-openjdk-jdk.*/:
// <org>/openj9-openjdk-jdk<version>(-zos)?
def tmp_version = ghprbGhRepository.substring(ghprbGhRepository.indexOf('-jdk')+4)
if ("${tmp_version}" == "") {
tmp_version = 'next'
}
if (tmp_version.contains('-')) {
// Strip off '-zos'
tmp_version = tmp_version.substring(0, tmp_version.indexOf('-'))
}
if ("${tmp_version}" == "") {
tmp_version = 'next'
}
RELEASES.add(tmp_version)
minCommentSize = 3
break
Expand Down

0 comments on commit 42f5da0

Please sign in to comment.