From 41ab24832fb2dc68e4a2c9c1bd0aa233d5f76985 Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Wed, 7 Jul 2021 20:11:47 +0000 Subject: [PATCH 1/4] modify how to crafe the update image name --- .../weblogic/kubernetes/ItIntrospectVersion.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java index 650d7ebd29b..f5c87982889 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java @@ -49,6 +49,7 @@ import oracle.weblogic.kubernetes.utils.BuildApplication; import oracle.weblogic.kubernetes.utils.ExecResult; import oracle.weblogic.kubernetes.utils.OracleHttpClient; +import oracle.weblogic.kubernetes.utils.TestUtils; import org.awaitility.core.ConditionEvaluationListener; import org.awaitility.core.ConditionFactory; import org.awaitility.core.EvaluatedCondition; @@ -77,7 +78,6 @@ import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_SECRET; import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST; -import static oracle.weblogic.kubernetes.TestConstants.KIND_REPO; import static oracle.weblogic.kubernetes.TestConstants.OKD; import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME; import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG; @@ -89,6 +89,7 @@ import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR; import static oracle.weblogic.kubernetes.actions.ActionConstants.WORK_DIR; import static oracle.weblogic.kubernetes.actions.TestActions.deleteSecret; +import static oracle.weblogic.kubernetes.actions.TestActions.dockerTag; import static oracle.weblogic.kubernetes.actions.TestActions.execCommand; import static oracle.weblogic.kubernetes.actions.TestActions.getCurrentIntrospectVersion; import static oracle.weblogic.kubernetes.actions.TestActions.getDomainCustomResource; @@ -118,6 +119,7 @@ import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createRouteForOKD; import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretForBaseImages; import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword; +import static oracle.weblogic.kubernetes.utils.CommonTestUtils.dockerLoginAndPushImageToRegistry; import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getExternalServicePodName; import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getIntrospectJobName; import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getPodCreationTime; @@ -159,9 +161,11 @@ public class ItIntrospectVersion { private static String nginxNamespace = null; private static int nodeportshttp; private static HelmParams nginxHelmParams = null; - private static String imageUpdate = KIND_REPO != null ? KIND_REPO + /*private static String imageUpdate = KIND_REPO != null ? KIND_REPO + (WEBLOGIC_IMAGE_NAME + ":" + WLS_UPDATE_IMAGE_TAG).substring(TestConstants.BASE_IMAGES_REPO.length() + 1) : WEBLOGIC_IMAGE_NAME + ":" + WLS_UPDATE_IMAGE_TAG; + + */ private final String wlSecretName = "weblogic-credentials"; private static String adminSvcExtHost = null; @@ -1008,6 +1012,11 @@ public void testUpdateImageName() { logger.info("Currently the image name used for the domain is: {0}", imageName); //change image name to imageUpdate + String tag = TestUtils.getDateAndTimeStamp(); + String imageUpdate = WEBLOGIC_IMAGE_NAME + ":" + tag; + dockerTag(imageName, imageUpdate); + dockerLoginAndPushImageToRegistry(imageUpdate); + StringBuffer patchStr = null; patchStr = new StringBuffer("[{"); patchStr.append("\"op\": \"replace\",") From f403613a65b5ae8e10f3ea51d4e346c574906c6b Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Thu, 8 Jul 2021 03:25:50 +0000 Subject: [PATCH 2/4] wip --- .../oracle/weblogic/kubernetes/ItIntrospectVersion.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java index f5c87982889..af89dc4d138 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java @@ -78,6 +78,7 @@ import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_SECRET; import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST; +import static oracle.weblogic.kubernetes.TestConstants.KIND_REPO; import static oracle.weblogic.kubernetes.TestConstants.OKD; import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME; import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG; @@ -166,6 +167,7 @@ public class ItIntrospectVersion { : WEBLOGIC_IMAGE_NAME + ":" + WLS_UPDATE_IMAGE_TAG; */ + private final String wlSecretName = "weblogic-credentials"; private static String adminSvcExtHost = null; @@ -1012,8 +1014,11 @@ public void testUpdateImageName() { logger.info("Currently the image name used for the domain is: {0}", imageName); //change image name to imageUpdate - String tag = TestUtils.getDateAndTimeStamp(); - String imageUpdate = WEBLOGIC_IMAGE_NAME + ":" + tag; + String imageTag = TestUtils.getDateAndTimeStamp(); + //String imageUpdate = WEBLOGIC_IMAGE_NAME + ":" + tag; + String imageUpdate = KIND_REPO != null ? KIND_REPO + + (WEBLOGIC_IMAGE_NAME + ":" + imageTag).substring(TestConstants.BASE_IMAGES_REPO.length() + 1) + : WEBLOGIC_IMAGE_NAME + ":" + imageTag; dockerTag(imageName, imageUpdate); dockerLoginAndPushImageToRegistry(imageUpdate); From 8a50fc9dd84c7d7b714feae817df12f1359e494f Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Thu, 8 Jul 2021 17:22:46 +0000 Subject: [PATCH 3/4] clean up --- .../oracle/weblogic/kubernetes/ItIntrospectVersion.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java index af89dc4d138..ee6ae3abf41 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java @@ -162,11 +162,6 @@ public class ItIntrospectVersion { private static String nginxNamespace = null; private static int nodeportshttp; private static HelmParams nginxHelmParams = null; - /*private static String imageUpdate = KIND_REPO != null ? KIND_REPO - + (WEBLOGIC_IMAGE_NAME + ":" + WLS_UPDATE_IMAGE_TAG).substring(TestConstants.BASE_IMAGES_REPO.length() + 1) - : WEBLOGIC_IMAGE_NAME + ":" + WLS_UPDATE_IMAGE_TAG; - - */ private final String wlSecretName = "weblogic-credentials"; @@ -974,7 +969,8 @@ public void testCreateNewCluster() { /** * Modify the domain scope property * From: "image: container-registry.oracle.com/middleware/weblogic:12.2.1.4" to - * To: "image: container-registry.oracle.com/middleware/weblogic:14.1.1.0-11" + * To: "image: container-registry.oracle.com/middleware/weblogic:DateAndTimeStamp" + * e.g, "image:container-registry.oracle.com/middleware/weblogic:2021-07-08-162571383699" * Verify all the pods are restarted and back to ready state * Verify the admin server is accessible and cluster members are healthy * This test will be skipped if the image tag is the latest WebLogic image tag @@ -1015,7 +1011,6 @@ public void testUpdateImageName() { //change image name to imageUpdate String imageTag = TestUtils.getDateAndTimeStamp(); - //String imageUpdate = WEBLOGIC_IMAGE_NAME + ":" + tag; String imageUpdate = KIND_REPO != null ? KIND_REPO + (WEBLOGIC_IMAGE_NAME + ":" + imageTag).substring(TestConstants.BASE_IMAGES_REPO.length() + 1) : WEBLOGIC_IMAGE_NAME + ":" + imageTag; From 77b215e3a083ac084f7bf233abfbd3d5d5703a3f Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Thu, 8 Jul 2021 17:51:50 +0000 Subject: [PATCH 4/4] edit the comment --- .../java/oracle/weblogic/kubernetes/ItIntrospectVersion.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java index ee6ae3abf41..6a5195df525 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java @@ -968,9 +968,10 @@ public void testCreateNewCluster() { /** * Modify the domain scope property - * From: "image: container-registry.oracle.com/middleware/weblogic:12.2.1.4" to + * From: "image: container-registry.oracle.com/middleware/weblogic:ImageTagBeingUsed" to * To: "image: container-registry.oracle.com/middleware/weblogic:DateAndTimeStamp" - * e.g, "image:container-registry.oracle.com/middleware/weblogic:2021-07-08-162571383699" + * e.g, From ""image: container-registry.oracle.com/middleware/weblogic:12.2.1.4" + * To: "image:container-registry.oracle.com/middleware/weblogic:2021-07-08-162571383699" * Verify all the pods are restarted and back to ready state * Verify the admin server is accessible and cluster members are healthy * This test will be skipped if the image tag is the latest WebLogic image tag