use IT_CLASS var in archive file name

Author: vanajamukkara

integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

@@ -597,7 +597,7 @@ private void callWebAppAndVerifyScaling(Domain domain, int replicas) throws Exce
     }
   }
 
-  public static void tearDown() throws Exception {
+  public static void tearDown(String iTClassName) throws Exception {
     logger.log(
         Level.INFO,
         "TEARDOWN: Starting Test Run TearDown (cleanup and state-dump)."
@@ -606,8 +606,11 @@ public static void tearDown() throws Exception {
             + "after the tearDown completes. Note that tearDown itself may report errors,"
             + " but this won't affect the outcome of the test results.");
     StringBuffer cmd =
-        new StringBuffer("export RESULT_ROOT=$RESULT_ROOT && export PV_ROOT=$PV_ROOT && ");
-    cmd.append(BaseTest.getProjectRoot())
+        new StringBuffer(
+            "export RESULT_ROOT=$RESULT_ROOT && export PV_ROOT=$PV_ROOT && export IT_CLASS=");
+    cmd.append(iTClassName)
+        .append(" && ")
+        .append(BaseTest.getProjectRoot())
         .append("/integration-tests/src/test/resources/statedump.sh");
     logger.info("Running " + cmd);
 

integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

@@ -54,7 +54,7 @@ public static void staticUnPrepare() throws Exception {
     logger.info("BEGIN");
     logger.info("Run once, release cluster lease");
 
-    tearDown();
+    tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
 
     logger.info("SUCCESS");
   }

integration-tests/src/test/java/oracle/kubernetes/operator/ITPodsRestart.java

@@ -64,7 +64,7 @@ public static void staticUnPrepare() throws Exception {
       logger.info("Run once, release cluster lease");
 
       destroyPodsRestartdomain();
-      tearDown();
+      tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
 
       logger.info("SUCCESS");
     }

integration-tests/src/test/java/oracle/kubernetes/operator/ITServerDiscovery.java

@@ -130,7 +130,7 @@ public static void staticUnPrepare() throws Exception {
       logger.info("BEGIN");
       logger.info("Run once, release cluster lease");
 
-      tearDown();
+      tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
 
       logger.info("SUCCESS");
     }

integration-tests/src/test/java/oracle/kubernetes/operator/ITSessionMigration.java

@@ -97,7 +97,7 @@ public static void staticUnPrepare() throws Exception {
       logger.info("BEGIN");
       logger.info("Run once, release cluster lease");
 
-      tearDown();
+      tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
 
       logger.info("SUCCESS");
     }

integration-tests/src/test/java/oracle/kubernetes/operator/ITSitConfig.java

@@ -107,7 +107,7 @@ public static void staticUnPrepare() throws Exception {
     if (!QUICKTEST) {
       ExecResult result = TestUtils.exec("kubectl delete -f " + mysqlYamlFile);
       destroySitConfigDomain();
-      tearDown();
+      tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
     }
   }
 

integration-tests/src/test/java/oracle/kubernetes/operator/ITUsabilityOperatorHelmChart.java

@@ -59,7 +59,7 @@ public static void staticUnPrepare() throws Exception {
       logger.info("BEGIN");
       logger.info("Run once, release cluster lease");
 
-      tearDown();
+      tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
 
       logger.info("SUCCESS");
     }

integration-tests/src/test/resources/statedump.sh

@@ -17,7 +17,7 @@ function state_dump {
      local SCRIPTPATH="$PROJECT_ROOT/src/integration-tests/bash"
      local LEASE_ID="$LEASE_ID"
      local ARCHIVE_DIR="$RESULT_ROOT/acceptance_test_pv_archive"
-     local ARCHIVE_FILE="IntSuite.`date '+%Y%m%d%H%M%S'`.jar"
+     local ARCHIVE_FILE="IntSuite.${IT_CLASS}.PV.`date '+%Y%m%d%H%M%S'`.jar"
      local ARCHIVE="$ARCHIVE_DIR/$ARCHIVE_FILE"
 
      if [ ! -d "$RESULT_DIR" ]; then

src/integration-tests/bash/archive.sh

@@ -24,7 +24,7 @@ function fail {
 function archive {
   local SOURCE_DIR="${1?}"
   local ARCHIVE_DIR="${2?}"
-  local ARCHIVE_FILE="IntSuite.`date '+%Y%m%d%H%M%S'`.jar"
+  local ARCHIVE_FILE="IntSuite.${IT_CLASS}.TMP.`date '+%Y%m%d%H%M%S'`.jar"
   local ARCHIVE="$ARCHIVE_DIR/$ARCHIVE_FILE"
   local OUTFILE="/tmp/$ARCHIVE_FILE"