From 8d48c9fe5762f055af8b82a9b7e0069ab24debdb Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Tue, 7 Mar 2023 12:32:39 -0500 Subject: [PATCH 1/2] Remove suffix #id\d{1} as part of testcase name -Jtreg doesn't support to specify testcase name suffixed with #id\d{1} -the special character in url without encoding will also lead to wrong behavior Signed-off-by: Sophia Guo --- buildenv/jenkins/JenkinsfileBase | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase index ee4141c750..d9f35a3edb 100644 --- a/buildenv/jenkins/JenkinsfileBase +++ b/buildenv/jenkins/JenkinsfileBase @@ -1102,6 +1102,8 @@ def addFailedTestsGrinderLink(paths=""){ failedTestCasesInfo = failedTestCasesInfo.substring(failedTestCasesInfo.indexOf('TEST:')) failedTestCasesInfo = failedTestCasesInfo.substring(0, failedTestCasesInfo.indexOf('Test results:')) failedTestCasesInfo = failedTestCasesInfo.split("\\n").join(" ").replaceAll("TEST: ", "") + //Remove #id suffixed to the openjdk testcase name. Jtreg doesn't work with it. + failedTestCasesInfo = failedTestCasesInfo.replaceAll(/#id\d{1,}/, "") if (failedtest.startsWith("jdk_")) { jdkFailedTestCaseList += "${failedTestCasesInfo} " } else { From 7ebd8d30da059cc33657c49f7b78bf84bbce523b Mon Sep 17 00:00:00 2001 From: Martijn Verburg Date: Wed, 8 Mar 2023 10:57:03 +1300 Subject: [PATCH 2/2] Update buildenv/jenkins/JenkinsfileBase --- buildenv/jenkins/JenkinsfileBase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase index d9f35a3edb..470a508a19 100644 --- a/buildenv/jenkins/JenkinsfileBase +++ b/buildenv/jenkins/JenkinsfileBase @@ -1102,7 +1102,7 @@ def addFailedTestsGrinderLink(paths=""){ failedTestCasesInfo = failedTestCasesInfo.substring(failedTestCasesInfo.indexOf('TEST:')) failedTestCasesInfo = failedTestCasesInfo.substring(0, failedTestCasesInfo.indexOf('Test results:')) failedTestCasesInfo = failedTestCasesInfo.split("\\n").join(" ").replaceAll("TEST: ", "") - //Remove #id suffixed to the openjdk testcase name. Jtreg doesn't work with it. + // Remove #id suffixed to the openjdk testcase name. Jtreg doesn't work with it. failedTestCasesInfo = failedTestCasesInfo.replaceAll(/#id\d{1,}/, "") if (failedtest.startsWith("jdk_")) { jdkFailedTestCaseList += "${failedTestCasesInfo} "