Exclude test for FIPS OpenJdk (#4876)

-Disables FIPS test for `jdk_security_infra`, `jdk_security1`, `jdk_security2`, `jdk_security3`
-Disable FIPS test for all platforms, on versions 8 and above

related: backlog/issues/1089

Signed-off-by: Anna Babu Palathingal <[email protected]>
Co-authored-by: Kapil Anant Powar <[email protected]>

Enable verbose GC log in openjdk tests (#4873)

-Prepend -Xverbosegclog for all operating systems
-Prepend when JDK_IMPL is openj9 or ibm

closes: #4872

Signed-off-by: Anna Babu Palathingal <[email protected]>

Author: annaibm

functional/security/Crypto/build.xml

@@ -53,12 +53,8 @@
 	</target>
 
 	<import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
-
-	<!-- Call getJtregVersion, getJtreg target from getDependencies.xml -->
-    <target name="invokeGetJtreg" depends="getJtregVersion,getJtreg">
-    </target>
-	
-	<target name="dist" depends="invokeGetJtreg,getCryptoTest" description="generate the distribution">
+		
+	<target name="dist" depends="getJtreg,getCryptoTest" description="generate the distribution">
 		<copy todir="${DEST}">
 			<fileset dir="${src}" includes="*.xml,*.mk" />
 		</copy>

functional/security/ssl-tests/build.xml

@@ -53,12 +53,8 @@
     </target>
 
     <import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
-   
-    <!-- Call getJtregVersion, getJtreg target from getDependencies.xml -->
-    <target name="invokeGetJtreg" depends="getJtregVersion,getJtreg">
-    </target>
-
-    <target name="dist" depends="invokeGetJtreg,getSsltestsTest" description="generate the distribution">
+    
+    <target name="dist" depends="getJtreg,getSsltestsTest" description="generate the distribution">
         <copy todir="${DEST}">
             <fileset dir="${src}" includes="*.xml,*.mk" />
         </copy>

openjdk/build.xml

@@ -43,10 +43,6 @@
 
 	<import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
 
-   <!-- Call getJtregVersion, getJtreg target from getDependencies.xml -->
-    <target name="invokeGetJtreg" depends="getJtregVersion,getJtreg">
-    </target>
-
 	<target name="getOpenjdk" depends="openjdk-jdk.check" unless="jdkdir.exists">
 		<!-- Windows API limitation of file paths having 260 characters or fewer,
 			 run the config command to allow file paths of 4096 characters
@@ -242,7 +238,7 @@
 		</condition>
 	</target>
 
-	<target name="dist" depends="invokeGetJtreg, getOpenjdk" description="generate the distribution">
+	<target name="dist" depends="getJtreg, getOpenjdk" description="generate the distribution">
 		<copy todir="${DEST}">
 			<fileset dir="${src}" includes="*.xml,excludes/ProblemList*.txt,*.mk"/>
 		</copy>

openjdk/playlist.xml

@@ -1047,6 +1047,13 @@
 	</test>
 	<test>
 		<testCaseName>jdk_security1</testCaseName>
+		<disables>
+			<disable>
+				<comment>https://github.ibm.com/runtimes/backlog/issues/1089</comment>
+				<impl>openj9</impl>
+				<testflag>fips140_2</testflag>
+			</disable>
+		</disables>
 		<variations>
 			<variation>Mode150</variation>
 			<variation>Mode650</variation>
@@ -1073,6 +1080,13 @@
 	</test>
 	<test>
 		<testCaseName>jdk_security2</testCaseName>
+		<disables>
+			<disable>
+				<comment>https://github.ibm.com/runtimes/backlog/issues/1089</comment>
+				<impl>openj9</impl>
+				<testflag>fips140_2</testflag>
+			</disable>
+		</disables>
 		<variations>
 			<variation>Mode150</variation>
 			<variation>Mode650</variation>
@@ -1105,6 +1119,11 @@
 				<platform>.*windows.*</platform>
 				<version>8</version>
 			</disable>
+			<disable>
+				<comment>https://github.ibm.com/runtimes/backlog/issues/1089</comment>
+				<impl>openj9</impl>
+				<testflag>fips140_2</testflag>
+			</disable>
 		</disables>
 		<variations>
 			<variation>Mode150</variation>
@@ -1852,6 +1871,13 @@
 	</test>
 	<test>
 		<testCaseName>jdk_security_infra</testCaseName>
+		<disables>
+			<disable>
+				<comment>https://github.ibm.com/runtimes/backlog/issues/1089</comment>
+				<impl>openj9</impl>
+				<testflag>fips140_2</testflag>
+			</disable>
+		</disables>	
 		<variations>
 			<variation>Mode150</variation>
 			<variation>Mode650</variation>