Remove hardcoded OCIR in Dockerfile and change dataHome to run tests in OKD

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

@@ -36,6 +36,8 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
+import static oracle.weblogic.kubernetes.TestConstants.BUSYBOX_IMAGE;
+import static oracle.weblogic.kubernetes.TestConstants.BUSYBOX_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_REPO;
 import static oracle.weblogic.kubernetes.TestConstants.KIND_REPO;
 import static oracle.weblogic.kubernetes.TestConstants.MII_AUXILIARY_IMAGE_NAME;
@@ -53,6 +55,7 @@
 import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WDT_DOWNLOAD_FILENAME_DEFAULT;
+import static oracle.weblogic.kubernetes.actions.ActionConstants.WORK_DIR;
 import static oracle.weblogic.kubernetes.actions.TestActions.buildAppArchive;
 import static oracle.weblogic.kubernetes.actions.TestActions.createDomainCustomResource;
 import static oracle.weblogic.kubernetes.actions.TestActions.defaultAppParams;
@@ -1229,8 +1232,18 @@ public void tearDownAll() {
   }
 
   private void createAuxiliaryImage(String stageDirPath, String dockerFileLocation, String auxiliaryImage) {
+    //replace the BUSYBOX_IMAGE and BUSYBOX_TAG in Dockerfile
+    Path dockerDestFile = Paths.get(WORK_DIR, "auximages", "Dockerfile");
+    assertDoesNotThrow(() -> {
+      Files.createDirectories(dockerDestFile.getParent());
+      Files.copy(Paths.get(dockerFileLocation),
+          dockerDestFile, StandardCopyOption.REPLACE_EXISTING);
+      replaceStringInFile(dockerDestFile.toString(), "BUSYBOX_IMAGE", BUSYBOX_IMAGE);
+      replaceStringInFile(dockerDestFile.toString(), "BUSYBOX_TAG", BUSYBOX_TAG);
+    });
+
     String cmdToExecute = String.format("cd %s && docker build -f %s %s -t %s .",
-        stageDirPath, dockerFileLocation,
+        stageDirPath, dockerDestFile.toString(),
         "--build-arg AUXILIARY_IMAGE_PATH=/auxiliary", auxiliaryImage);
     assertTrue(new Command()
         .withParams(new CommandParams()

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

@@ -146,7 +146,7 @@ class ItMultiDomainModelsWithLoadBalancer {
   private static final String WLDF_OPENSESSION_APP = "opensessionapp";
   private static final String WLDF_OPENSESSION_APP_CONTEXT_ROOT = "opensession";
   private static final String wlSecretName = "weblogic-credentials";
-  private static final String DATA_HOME_OVERRIDE = "/u01/oracle/mydata";
+  private static final String DATA_HOME_OVERRIDE = "/u01/mydata";
   private static final String miiImageName = "mii-image";
   private static final String wdtModelFileForMiiDomain = "model-multiclusterdomain-sampleapp-wls.yaml";
   private static final String miiDomainUid = "miidomain";
@@ -552,7 +552,7 @@ void testLivenessProbe() {
 
   /**
    * Verify dataHome override in a domain with domain in image type.
-   * In this domain, set dataHome to /u01/oracle/mydata in domain custom resource
+   * In this domain, set dataHome to /u01/mydata in domain custom resource
    * The domain contains JMS and File Store configuration
    * File store directory is set to /u01/oracle/customFileStore in the model file which should be overridden by dataHome
    * File store and JMS server are targeted to the WebLogic cluster cluster-1

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

@@ -242,7 +242,7 @@ public interface TestConstants {
   public static final String MII_AUXILIARY_IMAGE_NAME = DOMAIN_IMAGES_REPO + "mii-ai-image";
   public static final boolean SKIP_BUILD_IMAGES_IF_EXISTS =
       Boolean.parseBoolean(getNonEmptySystemProperty("wko.it.skip.build.images.if.exists", "false"));
-  public static final String BUSYBOX_IMAGE = "phx.ocir.io/weblogick8s/test-images/docker/busybox";
+  public static final String BUSYBOX_IMAGE = OCIR_REGISTRY + "/weblogick8s/test-images/docker/busybox";
   public static final String BUSYBOX_TAG = "1.34.1";
 
   // Skip the mii/wdt basic image build locally if needed

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DomainUtils.java

@@ -662,7 +662,7 @@ public static Domain createDomainResourceForDomainInImage(String domainUid,
         .spec(new DomainSpec()
             .domainUid(domainUid)
             .domainHome(WDT_IMAGE_DOMAINHOME_BASE_DIR + "/" + domainUid)
-            .dataHome("/u01/oracle/mydata")
+            .dataHome("/u01/mydata")
             .domainHomeSourceType("Image")
             .image(imageName)
             .addImagePullSecretsItem(new V1LocalObjectReference()

integration-tests/src/test/resources/auxiliaryimage/Dockerfile

@@ -16,7 +16,7 @@
 #   Default '/auxiliary'.
 #
 
-FROM phx.ocir.io/weblogick8s/test-images/docker/busybox:1.34.1
+FROM BUSYBOX_IMAGE:BUSYBOX_TAG
 ARG AUXILIARY_IMAGE_PATH=/auxiliary
 ARG USER=oracle
 ARG USERID=1000

integration-tests/src/test/resources/auxiliaryimage/negative/Dockerfile

@@ -16,7 +16,7 @@
 #   Default '/auxiliary'.
 #
 
-FROM phx.ocir.io/weblogick8s/test-images/docker/busybox:1.34.1
+FROM BUSYBOX_IMAGE:BUSYBOX_TAG
 ARG AUXILIARY_IMAGE_PATH=/auxiliary
 ARG USER=tester
 ARG USERID=1001