Merge pull request #20887 from keithc-ca/pr-zos

Correct handling of pull request builds for z/OS
eclipse-openj9 · Jan 7, 2025 · d471e57 · d471e57
2 parents a32dd87 + 42f5da0
commit d471e57
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/buildenv/jenkins/common/pipeline-functions.groovy b/buildenv/jenkins/common/pipeline-functions.groovy
@@ -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