Skip to content

Commit 42f5da0

Browse files
committed
Correct handling of pull request builds for z/OS
Remove "-zos" suffix before checking whether the version is "next". Signed-off-by: Keith W. Campbell <[email protected]>
1 parent a32dd87 commit 42f5da0

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

buildenv/jenkins/common/pipeline-functions.groovy

+3-3
Original file line numberDiff line numberDiff line change
@@ -726,13 +726,13 @@ def setup_pull_request_single_comment(parsedComment) {
726726
case ~/.*openj9-openjdk-jdk.*/:
727727
// <org>/openj9-openjdk-jdk<version>(-zos)?
728728
def tmp_version = ghprbGhRepository.substring(ghprbGhRepository.indexOf('-jdk')+4)
729-
if ("${tmp_version}" == "") {
730-
tmp_version = 'next'
731-
}
732729
if (tmp_version.contains('-')) {
733730
// Strip off '-zos'
734731
tmp_version = tmp_version.substring(0, tmp_version.indexOf('-'))
735732
}
733+
if ("${tmp_version}" == "") {
734+
tmp_version = 'next'
735+
}
736736
RELEASES.add(tmp_version)
737737
minCommentSize = 3
738738
break

0 commit comments

Comments
 (0)