From eb338a6e00e49156ee9ce20497e1ebdea8c9d9d7 Mon Sep 17 00:00:00 2001
From: Lan Xia <Lan_Xia@ca.ibm.com>
Date: Tue, 5 Nov 2024 17:01:39 -0500
Subject: [PATCH] Remove test cases

Signed-off-by: Lan Xia <Lan_Xia@ca.ibm.com>
---
 buildenv/jenkins/JenkinsfileBase     |  3 +--
 functional/MockitoTests/playlist.xml | 16 ----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase
index 4ad1d65cb9..9c64b8b06d 100644
--- a/buildenv/jenkins/JenkinsfileBase
+++ b/buildenv/jenkins/JenkinsfileBase
@@ -1366,7 +1366,6 @@ def generateJob (newJobs, childTest, testJobName) {
  * If the JOB_NAME contains _rerun, _testList_ or _iteration_, rerun job will not be triggered at the same level.
 */
 def triggerRerunJob (rerunTestJobParams) {
-	echo "rerunTestJobParams: ${rerunTestJobParams}"
 	if (!JOB_NAME.contains("_rerun") && !JOB_NAME.contains("_testList_") && !JOB_NAME.contains("_iteration_")) {
 		int rerunIterations = params.RERUN_ITERATIONS ? params.RERUN_ITERATIONS.toInteger() : 0
 		if ((rerunIterations > 0 && env.FAILED_TESTS?.trim()) || (params.RERUN_FAILURE && rerunTestJobParams)) {
@@ -1465,7 +1464,7 @@ def archiveChildJobTap(childJobs) {
 					def childResult = cjob.value.getCurrentResult()
 					echo "${name} #${buildId} completed with status ${childResult}"
 					// track childTestJobParams if it is FAILURE job
-					if (childResult == "FAILURE" || childResult == "ABORTED") {
+					if (childResult == "FAILURE") {
 						childTestJobParams << parallelTestParams.findAll {it.key == name}
 					}
 
diff --git a/functional/MockitoTests/playlist.xml b/functional/MockitoTests/playlist.xml
index 5b1ecc3e9f..3f87117af2 100644
--- a/functional/MockitoTests/playlist.xml
+++ b/functional/MockitoTests/playlist.xml
@@ -14,18 +14,6 @@
 -->
 
 <playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../TKG/resources/playlist.xsd">
-	<test>
-		<testCaseName>triggerFailure</testCaseName>
-		<command>
-			$(JAVA_COMMAND) $(JVM_OPTIONS) -cxbxbxc; \
-			$(TEST_STATUS)</command>
-		<levels>
-			<level>extended</level>
-		</levels>
-		<groups>
-			<group>functional</group>
-		</groups>
-	</test>
 	<test>
 		<testCaseName>MockitoMockTest</testCaseName>
 		<disables>
@@ -34,10 +22,6 @@
 				<platform>.*zos.*</platform>
 			</disable>
 		</disables>
-		<variations>
-			<variation>Mode150</variation>
-			<variation>Mode650</variation>
-		</variations>
 		<command>
 			$(JAVA_COMMAND) $(JVM_OPTIONS) -cp $(Q)$(RESOURCES_DIR)$(P)$(TEST_RESROOT)$(D)MockitoTests.jar$(P)$(LIB_DIR)$(D)mockito-core.jar$(P)$(LIB_DIR)$(D)byte-buddy.jar$(P)$(LIB_DIR)$(D)byte-buddy-agent.jar$(P)$(LIB_DIR)$(D)objenesis.jar$(Q) test.java.MockitoMockTest ; \
 			$(TEST_STATUS)</command>