Merge pull request #1107 from oracle/minor-introspector-test-fix

minor test fixes

Author: rjeberhard

src/integration-tests/introspector/introspectTest.sh

@@ -136,7 +136,8 @@ function cleanupMajor() {
   if [ $status -ne 0 ]; then
     trace "Error:  cleanup failed.   Cleanup output:"
     cat ${test_home}/cleanup.out
-    exit 1
+    trace "Error:  cleanup failed."
+    return 1
   fi
 }
 
@@ -633,7 +634,8 @@ function checkDataSource() {
 #
 
 if [ ! "$RERUN_INTROSPECT_ONLY" = "true" ]; then
-  cleanupMajor
+  # retry on failure
+  cleanupMajor || cleanupMajor || exit 1
 else
   # This path assumes we've already run the test succesfully once, it re-uses
   # the existing domain-home/pv/pvc/secret/etc, deletes wl pods, deletes introspect job, then

src/integration-tests/introspector/wl-create-domain-pod.pyt

@@ -191,7 +191,8 @@ def createOracleDataSource(dsName,dsJNDI,dsGlobalTX,dsXAInterface,dsHost,dsPort,
   createDataSource(dsName, dsJNDI, dsDriver, dsGlobalTX, dsXAInterface, dsURL, dsUser, dsPass, dsMinSize, dsMaxSize, dsTest, dsTarget)
 
 def createMySQLDataSource(dsName,dsJNDI,dsGlobalTX,dsXAInterface,dsHost,dsPort,dsDB,dsUser,dsPass,dsMinSize,dsMaxSize,dsTarget):
-  dsDriver='com.mysql.cj.jdbc.Driver'
+  #dsDriver='com.mysql.cj.jdbc.Driver'
+  dsDriver='com.mysql.jdbc.Driver'
   dsURL='jdbc:mysql://' + dsHost + ':' + dsPort + '/' + dsDB
   dsTest='SQL SELECT 1'
   createDataSource(dsName, dsJNDI, dsDriver, dsGlobalTX, dsXAInterface, dsURL, dsUser, dsPass, dsMinSize, dsMaxSize, dsTest, dsTarget)