fix olcne test failures (#2612)

* fix olcne test failures

Author: xiancao

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java

@@ -114,16 +114,16 @@ class ItMiiAuxiliaryImage {
   private static String wdtDomainNamespace = null;
   private static LoggingFacade logger = null;
   private String domainUid = "domain1";
-  private static String miiAuxiliaryImage1 = MII_AUXILIARY_IMAGE_NAME + ":" + MII_BASIC_IMAGE_TAG + "1";
-  private static String miiAuxiliaryImage2 = MII_AUXILIARY_IMAGE_NAME + ":" + MII_BASIC_IMAGE_TAG + "2";
-  private static String miiAuxiliaryImage3 = MII_AUXILIARY_IMAGE_NAME + ":" + MII_BASIC_IMAGE_TAG + "3";
-  private static String miiAuxiliaryImage4 = MII_AUXILIARY_IMAGE_NAME + ":" + MII_BASIC_IMAGE_TAG + "4";
-  private static String miiAuxiliaryImage5 = MII_AUXILIARY_IMAGE_NAME + ":" + MII_BASIC_IMAGE_TAG + "5";
-  private static String miiAuxiliaryImage6 = MII_AUXILIARY_IMAGE_NAME + ":" + MII_BASIC_IMAGE_TAG + "6";
-  private static String errorPathAuxiliaryImage1 = MII_AUXILIARY_IMAGE_NAME + ":errorpathimage1";
-  private static String errorPathAuxiliaryImage2 = MII_AUXILIARY_IMAGE_NAME + ":errorpathimage2";
-  private static String errorPathAuxiliaryImage3 = MII_AUXILIARY_IMAGE_NAME + ":errorpathimage3";
-  private static String errorPathAuxiliaryImage4 = MII_AUXILIARY_IMAGE_NAME + ":errorpathimage4";
+  private static String miiAuxiliaryImage1 = MII_AUXILIARY_IMAGE_NAME + "-domain:" + MII_BASIC_IMAGE_TAG + "1";
+  private static String miiAuxiliaryImage2 = MII_AUXILIARY_IMAGE_NAME + "-domain:" + MII_BASIC_IMAGE_TAG + "2";
+  private static String miiAuxiliaryImage3 = MII_AUXILIARY_IMAGE_NAME + "-domain:" + MII_BASIC_IMAGE_TAG + "3";
+  private static String miiAuxiliaryImage4 = MII_AUXILIARY_IMAGE_NAME + "-domain:" + MII_BASIC_IMAGE_TAG + "4";
+  private static String miiAuxiliaryImage5 = MII_AUXILIARY_IMAGE_NAME + "-domain:" + MII_BASIC_IMAGE_TAG + "5";
+  private static String miiAuxiliaryImage6 = MII_AUXILIARY_IMAGE_NAME + "-domain:" + MII_BASIC_IMAGE_TAG + "6";
+  private static String errorPathAuxiliaryImage1 = MII_AUXILIARY_IMAGE_NAME + "-domain:errorpathimage1";
+  private static String errorPathAuxiliaryImage2 = MII_AUXILIARY_IMAGE_NAME + "-domain:errorpathimage2";
+  private static String errorPathAuxiliaryImage3 = MII_AUXILIARY_IMAGE_NAME + "-domain:errorpathimage3";
+  private static String errorPathAuxiliaryImage4 = MII_AUXILIARY_IMAGE_NAME + "-domain:errorpathimage4";
   private static Map<String, OffsetDateTime> podsWithTimeStamps = null;
   private final String adminServerPodName = domainUid + "-admin-server";
   private final String managedServerPrefix = domainUid + "-managed-server";
@@ -193,12 +193,13 @@ void testCreateDomainUsingMultipleAuxiliaryImages() {
         "weblogicenc", "weblogicenc");
 
     // create stage dir for first auxiliary image with image1
-    Path multipleAIPath1 = Paths.get(RESULTS_ROOT, "multipleauxiliaryimage1");
+    Path multipleAIPath1 = Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "multipleauxiliaryimage1");
     assertDoesNotThrow(() -> FileUtils.deleteDirectory(multipleAIPath1.toFile()),
         "Delete directory failed");
     assertDoesNotThrow(() -> Files.createDirectories(multipleAIPath1),
         "Create directory failed");
-    Path multipleAIPathToFile1 = Paths.get(RESULTS_ROOT, "multipleauxiliaryimage1/test.txt");
+    Path multipleAIPathToFile1 =
+        Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "multipleauxiliaryimage1/test.txt");
     String content = "1";
     assertDoesNotThrow(() -> Files.write(multipleAIPathToFile1, content.getBytes()),
         "Can't write to file " + multipleAIPathToFile1);
@@ -241,7 +242,7 @@ void testCreateDomainUsingMultipleAuxiliaryImages() {
     }
 
     // create stage dir for second auxiliary image with image2
-    Path multipleAIPath2 = Paths.get(RESULTS_ROOT, "multipleauxiliaryimage2");
+    Path multipleAIPath2 = Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "multipleauxiliaryimage2");
     assertDoesNotThrow(() -> FileUtils.deleteDirectory(multipleAIPath2.toFile()),
         "Delete directory failed");
     assertDoesNotThrow(() -> Files.createDirectories(multipleAIPath2),
@@ -250,7 +251,8 @@ void testCreateDomainUsingMultipleAuxiliaryImages() {
     // create models dir and copy model, archive files if any
     Path modelsPath2 = Paths.get(multipleAIPath2.toString(), "models");
     assertDoesNotThrow(() -> Files.createDirectories(modelsPath2));
-    Path multipleAIPathToFile2 = Paths.get(RESULTS_ROOT, "multipleauxiliaryimage2/test.txt");
+    Path multipleAIPathToFile2 =
+        Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "multipleauxiliaryimage2/test.txt");
     String content2 = "2";
     assertDoesNotThrow(() -> Files.write(multipleAIPathToFile2, content2.getBytes()),
         "Can't write to file " + multipleAIPathToFile2);
@@ -287,14 +289,17 @@ void testCreateDomainUsingMultipleAuxiliaryImages() {
     checkConfiguredJMSresouce(domainNamespace, adminServerPodName);
 
     //checking the order of loading for the auxiliary images, expecting file with content =2
-    assertDoesNotThrow(() -> FileUtils.deleteQuietly(Paths.get(RESULTS_ROOT, "/test.txt").toFile()));
+    assertDoesNotThrow(() ->
+        FileUtils.deleteQuietly(Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "/test.txt").toFile()));
     assertDoesNotThrow(() -> copyFileFromPod(domainNamespace,
         adminServerPodName, "weblogic-server",
         auxiliaryImagePath + "/test.txt",
-        Paths.get(RESULTS_ROOT, "/test.txt")), " Can't find file in the pod, or failed to copy");
+        Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "/test.txt")),
+        " Can't find file in the pod, or failed to copy");
 
     assertDoesNotThrow(() -> {
-      String fileContent = Files.readAllLines(Paths.get(RESULTS_ROOT, "/test.txt")).get(0);
+      String fileContent =
+          Files.readAllLines(Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "/test.txt")).get(0);
       assertEquals("2", fileContent, "The content of the file from auxiliary image path "
           + fileContent + "does not match the expected 2");
     }, "File from image2 was not loaded in the expected order");
@@ -309,7 +314,7 @@ void testCreateDomainUsingMultipleAuxiliaryImages() {
   @Order(2)
   @DisplayName("Test to update data source url in the  domain using auxiliary image")
   void testUpdateDataSourceInDomainUsingAuxiliaryImage() {
-    Path multipleAIPath1 = Paths.get(RESULTS_ROOT, "multipleauxiliaryimage1");
+    Path multipleAIPath1 = Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "multipleauxiliaryimage1");
     Path modelsPath1 = Paths.get(multipleAIPath1.toString(), "models");
 
 
@@ -435,7 +440,7 @@ void testErrorPathDomainMismatchMountPath() {
     createSecretsForDomain(adminSecretName, encryptionSecretName, errorpathDomainNamespace);
 
     // create stage dir for auxiliary image
-    Path errorpathAIPath1 = Paths.get(RESULTS_ROOT, "errorpathauxiimage1");
+    Path errorpathAIPath1 = Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "errorpathauxiimage1");
     assertDoesNotThrow(() -> FileUtils.deleteDirectory(errorpathAIPath1.toFile()),
         "Delete directory failed");
     assertDoesNotThrow(() -> Files.createDirectories(errorpathAIPath1),
@@ -517,7 +522,7 @@ void testErrorPathDomainMissingWDTBinary() {
     createSecretsForDomain(adminSecretName, encryptionSecretName, errorpathDomainNamespace);
 
     // create stage dir for auxiliary image
-    Path errorpathAIPath2 = Paths.get(RESULTS_ROOT, "errorpathauxiimage2");
+    Path errorpathAIPath2 = Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "errorpathauxiimage2");
     assertDoesNotThrow(() -> FileUtils.deleteDirectory(errorpathAIPath2.toFile()),
         "Delete directory failed");
     assertDoesNotThrow(() -> Files.createDirectories(errorpathAIPath2),
@@ -600,7 +605,7 @@ void testErrorPathDomainMissingDomainConfig() {
     createSecretsForDomain(adminSecretName, encryptionSecretName, errorpathDomainNamespace);
 
     // create stage dir for auxiliary image
-    Path errorpathAIPath3 = Paths.get(RESULTS_ROOT, "errorpathauxiimage3");
+    Path errorpathAIPath3 = Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "errorpathauxiimage3");
     assertDoesNotThrow(() -> FileUtils.deleteDirectory(errorpathAIPath3.toFile()),
         "Delete directory failed");
     assertDoesNotThrow(() -> Files.createDirectories(errorpathAIPath3),
@@ -778,13 +783,14 @@ void testErrorPathFilePermission() {
     createSecretsForDomain(adminSecretName, encryptionSecretName, errorpathDomainNamespace);
 
     // create stage dir for auxiliary image
-    Path errorpathAIPath1 = Paths.get(RESULTS_ROOT, "errorpathauxiimage4");
+    Path errorpathAIPath1 = Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "errorpathauxiimage4");
     assertDoesNotThrow(() -> FileUtils.deleteDirectory(errorpathAIPath1.toFile()),
         "Can't delete directory");
     assertDoesNotThrow(() -> Files.createDirectories(errorpathAIPath1),
         "Can't create directory");
 
-    Path errorpathAIPathToFile = Paths.get(RESULTS_ROOT, "errorpathauxiimage4/test1.txt");
+    Path errorpathAIPathToFile =
+        Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "errorpathauxiimage4/test1.txt");
     String content = "some text ";
     assertDoesNotThrow(() -> Files.write(errorpathAIPathToFile, content.getBytes()),
         "Can't write to file " + errorpathAIPathToFile);
@@ -896,7 +902,7 @@ void testUpdateWDTVersionUsingMultipleAuxiliaryImages() {
         "weblogicenc", "weblogicenc");
 
     // create stage dir for first auxiliary image containing domain configuration
-    Path multipleAIPath1 = Paths.get(RESULTS_ROOT, "multipleauxiliaryimage1");
+    Path multipleAIPath1 = Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "multipleauxiliaryimage1");
     assertDoesNotThrow(() -> FileUtils.deleteDirectory(multipleAIPath1.toFile()),
         "Delete directory failed");
     assertDoesNotThrow(() -> Files.createDirectories(multipleAIPath1),
@@ -937,7 +943,7 @@ void testUpdateWDTVersionUsingMultipleAuxiliaryImages() {
     }
 
     // create stage dir for second auxiliary image
-    Path multipleAIPath2 = Paths.get(RESULTS_ROOT, "multipleauxiliaryimage2");
+    Path multipleAIPath2 = Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "multipleauxiliaryimage2");
     assertDoesNotThrow(() -> FileUtils.deleteDirectory(multipleAIPath2.toFile()),
         "Delete directory failed");
     assertDoesNotThrow(() -> Files.createDirectories(multipleAIPath2), "Create directory failed");
@@ -963,7 +969,7 @@ void testUpdateWDTVersionUsingMultipleAuxiliaryImages() {
     }
 
     // create stage dir for third auxiliary image with latest wdt installation files only
-    Path multipleAIPath3 = Paths.get(RESULTS_ROOT, "multipleauxiliaryimage3");
+    Path multipleAIPath3 = Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "multipleauxiliaryimage3");
     assertDoesNotThrow(() -> FileUtils.deleteDirectory(multipleAIPath3.toFile()),
         "Delete directory failed");
     assertDoesNotThrow(() -> Files.createDirectories(multipleAIPath3),
@@ -1220,14 +1226,16 @@ private void checkConfiguredJDBCresouce(String domainNamespace, String adminServ
   }
 
   private String checkWDTVersion(String domainNamespace, String auxiliaryImagePath) throws Exception {
-    assertDoesNotThrow(() -> FileUtils.deleteQuietly(Paths.get(RESULTS_ROOT, "/WDTversion.txt").toFile()));
+    assertDoesNotThrow(() ->
+        FileUtils.deleteQuietly(Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "/WDTversion.txt").toFile()));
     assertDoesNotThrow(() -> copyFileFromPod(domainNamespace,
         adminServerPodName, "weblogic-server",
         auxiliaryImagePath + "/weblogic-deploy/VERSION.txt",
-        Paths.get(RESULTS_ROOT, "/WDTversion.txt")), " Can't find file in the pod, or failed to copy");
+        Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "/WDTversion.txt")),
+        " Can't find file in the pod, or failed to copy");
 
 
-    return Files.readAllLines(Paths.get(RESULTS_ROOT, "/WDTversion.txt")).get(0);
+    return Files.readAllLines(Paths.get(RESULTS_ROOT, this.getClass().getSimpleName(), "/WDTversion.txt")).get(0);
   }
 
   private boolean introspectorPodLogContainsExpectedErrorMsg(String domainUid,