From 78bdcc37eff20c92c5e9bc3cc1bd22604507b6b6 Mon Sep 17 00:00:00 2001 From: Sankar Neelakandan Date: Wed, 27 Apr 2022 13:19:10 -0700 Subject: [PATCH 1/3] changing the dataHome and busybox location --- .../weblogic/kubernetes/ItMiiAuxiliaryImage.java | 14 +++++++++++++- .../ItMultiDomainModelsWithLoadBalancer.java | 4 ++-- .../oracle/weblogic/kubernetes/TestConstants.java | 2 +- .../weblogic/kubernetes/utils/DomainUtils.java | 2 +- .../src/test/resources/auxiliaryimage/Dockerfile | 2 +- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java index d8313d256a7..a3a8ddf7e47 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java +++ b/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,17 @@ 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.copy(Paths.get(dockerFileLocation), + dockerDestFile, StandardCopyOption.REPLACE_EXISTING)); + assertDoesNotThrow(() -> { + 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() diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMultiDomainModelsWithLoadBalancer.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMultiDomainModelsWithLoadBalancer.java index abba2cacfc1..979521237f9 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMultiDomainModelsWithLoadBalancer.java +++ b/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 diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java index 92e30334185..220368cbfad 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java +++ b/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 diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DomainUtils.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DomainUtils.java index 1fec81ac912..18b2021f421 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DomainUtils.java +++ b/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() diff --git a/integration-tests/src/test/resources/auxiliaryimage/Dockerfile b/integration-tests/src/test/resources/auxiliaryimage/Dockerfile index bd58380370c..48f168e30fe 100644 --- a/integration-tests/src/test/resources/auxiliaryimage/Dockerfile +++ b/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 From bab34c13d04d22e442df702fc7867e0c2609484f Mon Sep 17 00:00:00 2001 From: Sankar Neelakandan Date: Wed, 27 Apr 2022 13:52:28 -0700 Subject: [PATCH 2/3] change busybox location --- .../src/test/resources/auxiliaryimage/negative/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/src/test/resources/auxiliaryimage/negative/Dockerfile b/integration-tests/src/test/resources/auxiliaryimage/negative/Dockerfile index 3817a4ae344..dd76a8c6103 100644 --- a/integration-tests/src/test/resources/auxiliaryimage/negative/Dockerfile +++ b/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 From aafda199dd899f4770dc6a0aaad3b607322e3ebe Mon Sep 17 00:00:00 2001 From: Sankar Neelakandan Date: Wed, 27 Apr 2022 13:57:41 -0700 Subject: [PATCH 3/3] create parent directory --- .../java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java index a3a8ddf7e47..7520ab2c06d 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java @@ -1234,9 +1234,10 @@ 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.copy(Paths.get(dockerFileLocation), - dockerDestFile, StandardCopyOption.REPLACE_EXISTING)); 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); });