From 42f5da01df712d074d00090974ee5efec8235ea2 Mon Sep 17 00:00:00 2001
From: "Keith W. Campbell" <keithc@ca.ibm.com>
Date: Mon, 6 Jan 2025 12:42:06 -0500
Subject: [PATCH] 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 <keithc@ca.ibm.com>
---
 buildenv/jenkins/common/pipeline-functions.groovy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildenv/jenkins/common/pipeline-functions.groovy b/buildenv/jenkins/common/pipeline-functions.groovy
index 35a2918a9ef..4a0fc48bb63 100644
--- 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