From 625bc96f2862bfd919954587ff42fc807bd3d3c4 Mon Sep 17 00:00:00 2001 From: "ANTARYAMI.PANIGRAHI@ORACLE.COM" Date: Fri, 28 Jan 2022 22:34:42 +0000 Subject: [PATCH 1/2] Initial check-in --- .../weblogic/kubernetes/ItCoherenceTests.java | 8 ++-- .../weblogic/kubernetes/ItDedicatedMode.java | 8 ++-- .../weblogic/kubernetes/ItElasticLogging.java | 6 ++- .../kubernetes/ItElasticLoggingFluentd.java | 5 ++- .../kubernetes/ItFmwBigCMMiiDomain.java | 10 +++-- .../ItFmwDynamicClusterMiiDomain.java | 4 +- .../weblogic/kubernetes/ItFmwMiiDomain.java | 10 +++-- .../weblogic/kubernetes/ItInitContainers.java | 9 ++-- .../kubernetes/ItIstioCoherenceTests.java | 8 ++-- .../kubernetes/ItIstioManagedCoherence.java | 8 ++-- .../weblogic/kubernetes/ItIstioMiiDomain.java | 6 +-- .../kubernetes/ItIstioMonitoringExporter.java | 6 +-- .../ItLivenessProbeCustomization.java | 7 +++- .../kubernetes/ItManagedCoherence.java | 8 ++-- .../kubernetes/ItMiiUpdateDomainConfig.java | 41 ++++++++++++------- .../kubernetes/ItMonitoringExporter.java | 16 ++++---- .../weblogic/kubernetes/ItPodTemplates.java | 8 ++-- .../weblogic/kubernetes/ItPodsRestart.java | 5 ++- .../kubernetes/ItPodsShutdownOption.java | 6 ++- .../kubernetes/ItServerStartPolicy.java | 16 +++++--- .../weblogic/kubernetes/ItStickySession.java | 8 ++-- .../ItUsabilityOperatorHelmChart.java | 14 +++++-- .../kubernetes/actions/impl/Operator.java | 6 ++- 23 files changed, 143 insertions(+), 80 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCoherenceTests.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCoherenceTests.java index f395c400d58..765ea80921b 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCoherenceTests.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCoherenceTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -38,6 +38,8 @@ import static java.util.concurrent.TimeUnit.MINUTES; 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.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.OCIR_SECRET_NAME; import static oracle.weblogic.kubernetes.actions.ActionConstants.APP_DIR; @@ -270,8 +272,8 @@ private static void createAndVerifyDomain(String domImage) { // create secret for admin credentials logger.info("Create secret for admin credentials"); String adminSecretName = "weblogic-credentials"; - assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, domainNamespace, - "weblogic", "welcome1"), + assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, + domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT), String.format("create secret for admin credentials failed for %s", adminSecretName)); // create encryption secret diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDedicatedMode.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDedicatedMode.java index 32ff697446f..d3de58ece8f 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDedicatedMode.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDedicatedMode.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -32,7 +32,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE; import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME; @@ -280,8 +282,8 @@ private void createDomain(String domainNamespace) { // create secret for admin credentials logger.info("Create secret for admin credentials"); String adminSecretName = "weblogic-credentials"; - assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, domainNamespace, - "weblogic", "welcome1"), + assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, + domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT), String.format("create secret for admin credentials failed for %s", adminSecretName)); // create encryption secret diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLogging.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLogging.java index 21b03becfa1..7b994515755 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLogging.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLogging.java @@ -36,6 +36,8 @@ import static java.util.concurrent.TimeUnit.MINUTES; 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.COPY_WLS_LOGGING_EXPORTER_FILE_NAME; import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.ELASTICSEARCH_HOST; @@ -364,8 +366,8 @@ private static void createAndVerifyDomain(String miiImage) { // create secret for admin credentials logger.info("Create secret for admin credentials"); String adminSecretName = "weblogic-credentials"; - assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, domainNamespace, - "weblogic", "welcome1"), + assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, + domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT), String.format("create secret for admin credentials failed for %s", adminSecretName)); // create encryption secret diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLoggingFluentd.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLoggingFluentd.java index a845d350113..c4e38553937 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLoggingFluentd.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLoggingFluentd.java @@ -51,6 +51,8 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; import static java.util.concurrent.TimeUnit.MINUTES; 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.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.ELASTICSEARCH_HOST; import static oracle.weblogic.kubernetes.TestConstants.ELASTICSEARCH_HTTPS_PORT; @@ -327,7 +329,8 @@ private static void createAndVerifyDomain(String miiImage) { logger.info("Create secret for admin credentials"); final String adminSecretName = "weblogic-credentials"; assertDoesNotThrow(() -> createSecretWithUsernamePasswordElk(adminSecretName, domainNamespace, - "weblogic", "welcome1", elasticSearchHost, elasticSearchPort), + ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT, + elasticSearchHost, elasticSearchPort), String.format("create secret for admin credentials failed for %s", adminSecretName)); // create encryption secret diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java index 934993d752b..c3abb94031c 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java @@ -1,4 +1,4 @@ -// Copyright (c) 2021, Oracle and/or its affiliates. +// Copyright (c) 2021, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -25,6 +25,8 @@ import static java.util.concurrent.TimeUnit.MINUTES; 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.DB_IMAGE_TO_USE_IN_SPEC; import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_NAME; import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TAG; @@ -163,8 +165,8 @@ void testFmwBigCMModelInImage() { assertDoesNotThrow(() -> createSecretWithUsernamePassword( adminSecretName, jrfDomainNamespace, - "weblogic", - "welcome1"), + ADMIN_USERNAME_DEFAULT, + ADMIN_PASSWORD_DEFAULT), String.format("createSecret failed for %s", adminSecretName)); // create encryption secret @@ -191,7 +193,7 @@ void testFmwBigCMModelInImage() { assertDoesNotThrow(() -> createOpsswalletpasswordSecret( opsswalletpassSecretName, jrfDomainNamespace, - "welcome1"), + ADMIN_PASSWORD_DEFAULT), String.format("createSecret failed for %s", opsswalletpassSecretName)); logger.info("Create an image with jrf model file"); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java index d8aa500b4b4..7c64643531e 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java @@ -1,4 +1,4 @@ -// Copyright (c) 2021, Oracle and/or its affiliates. +// Copyright (c) 2021, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -190,7 +190,7 @@ private void createFmwDomainAndVerify() { assertDoesNotThrow(() -> createOpsswalletpasswordSecret( opsswalletpassSecretName, domainNamespace, - "welcome1"), + ADMIN_PASSWORD_DEFAULT), String.format("createSecret failed for %s", opsswalletpassSecretName)); logger.info("Create an image with jrf model file"); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java index 48e1a5552ec..7e960d63ac8 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -26,6 +26,8 @@ import static java.util.concurrent.TimeUnit.MINUTES; 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.DB_IMAGE_TO_USE_IN_SPEC; import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_NAME; import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TAG; @@ -168,8 +170,8 @@ void testFmwModelInImage() { assertDoesNotThrow(() -> createSecretWithUsernamePassword( adminSecretName, fmwDomainNamespace, - "weblogic", - "welcome1"), + ADMIN_USERNAME_DEFAULT, + ADMIN_PASSWORD_DEFAULT), String.format("createSecret failed for %s", adminSecretName)); // create encryption secret @@ -196,7 +198,7 @@ void testFmwModelInImage() { assertDoesNotThrow(() -> createOpsswalletpasswordSecret( opsswalletpassSecretName, fmwDomainNamespace, - "welcome1"), + ADMIN_PASSWORD_DEFAULT), String.format("createSecret failed for %s", opsswalletpassSecretName)); logger.info("Create an image with jrf model file"); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItInitContainers.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItInitContainers.java index 9d18152dc26..5e32e572d76 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItInitContainers.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItInitContainers.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -33,7 +33,9 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE; import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME; @@ -137,7 +139,7 @@ public static void initAll(@Namespaces(5) List namespaces) { .helmParams(opHelmParams) .javaLoggingLevel(("FINE")); assertTrue(upgradeAndVerifyOperator(opNamespace, opParams), - "Failed to upgrade operator to FINE logging leve"); + "Failed to upgrade operator to FINE logging level"); } private static void createSecrets(String domainNamespace) { @@ -154,7 +156,8 @@ private static void createSecrets(String domainNamespace) { // create secret for admin credentials logger.info("Creating secret for admin credentials"); - createSecretWithUsernamePassword(adminSecretName, domainNamespace, "weblogic", "welcome1"); + createSecretWithUsernamePassword(adminSecretName, domainNamespace, + ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT); // create encryption secret logger.info("Creating encryption secret"); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCoherenceTests.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCoherenceTests.java index f43ab17914e..38d7903ee31 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCoherenceTests.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCoherenceTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -38,6 +38,8 @@ import static java.util.concurrent.TimeUnit.MINUTES; 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.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.OCIR_SECRET_NAME; import static oracle.weblogic.kubernetes.actions.ActionConstants.APP_DIR; @@ -279,8 +281,8 @@ private static void createAndVerifyDomain(String domImage) { // create secret for admin credentials logger.info("Create secret for admin credentials"); String adminSecretName = "weblogic-credentials"; - assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, domainNamespace, - "weblogic", "welcome1"), + assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, + domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT), String.format("create secret for admin credentials failed for %s", adminSecretName)); // create encryption secret diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioManagedCoherence.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioManagedCoherence.java index 15cfff0efa7..a0e80e37721 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioManagedCoherence.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioManagedCoherence.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -33,7 +33,9 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST; import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE; @@ -266,8 +268,8 @@ private static void createAndVerifyDomain(String domImage) { // create secret for admin credentials logger.info("Create secret for admin credentials"); String adminSecretName = "weblogic-credentials"; - assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, domainInImageNamespace, - "weblogic", "welcome1"), + assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, + domainInImageNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT), String.format("create secret for admin credentials failed for %s", adminSecretName)); // create encryption secret diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMiiDomain.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMiiDomain.java index d3b6cc42ca8..a6a660855e6 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMiiDomain.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMiiDomain.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -157,8 +157,8 @@ void testIstioModelInImage() { assertDoesNotThrow(() -> createSecretWithUsernamePassword( adminSecretName, domainNamespace, - "weblogic", - "welcome1"), + ADMIN_USERNAME_DEFAULT, + ADMIN_PASSWORD_DEFAULT), String.format("createSecret failed for %s", adminSecretName)); // create encryption secret diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMonitoringExporter.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMonitoringExporter.java index 932e13ebda6..d439700452a 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMonitoringExporter.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMonitoringExporter.java @@ -1,4 +1,4 @@ -// Copyright (c) 2021, Oracle and/or its affiliates. +// Copyright (c) 2021, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -249,8 +249,8 @@ private void setupIstioModelInImageDomain(String miiImage, String domainNamespac assertDoesNotThrow(() -> createSecretWithUsernamePassword( adminSecretName, domainNamespace, - "weblogic", - "welcome1"), + ADMIN_USERNAME_DEFAULT, + ADMIN_PASSWORD_DEFAULT), String.format("createSecret failed for %s", adminSecretName)); // create encryption secret diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItLivenessProbeCustomization.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItLivenessProbeCustomization.java index 3a9c459d84b..15b01f68fad 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItLivenessProbeCustomization.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItLivenessProbeCustomization.java @@ -1,4 +1,4 @@ -// Copyright (c) 2021, Oracle and/or its affiliates. +// Copyright (c) 2021, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -37,7 +37,9 @@ import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE; import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_APP_NAME; @@ -256,7 +258,8 @@ private static void createAndVerifyMiiDomain(String miiImage) { // create secret for admin credentials logger.info("Creating secret for admin credentials"); String adminSecretName = "weblogic-credentials"; - createSecretWithUsernamePassword(adminSecretName, domainNamespace, "weblogic", "welcome1"); + createSecretWithUsernamePassword(adminSecretName, domainNamespace, + ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT); // create encryption secret logger.info("Creating encryption secret"); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItManagedCoherence.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItManagedCoherence.java index 478dcb56fcb..d479de1af67 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItManagedCoherence.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItManagedCoherence.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -38,6 +38,8 @@ import static java.util.concurrent.TimeUnit.MINUTES; 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.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST; import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE; @@ -239,8 +241,8 @@ private static void createAndVerifyDomain(String domImage) { // create secret for admin credentials logger.info("Create secret for admin credentials"); String adminSecretName = "weblogic-credentials"; - assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, domainNamespace, - "weblogic", "welcome1"), + assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, + domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT), String.format("create secret for admin credentials failed for %s", adminSecretName)); // create encryption secret diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiUpdateDomainConfig.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiUpdateDomainConfig.java index 7f7f96b62c2..56674f97125 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiUpdateDomainConfig.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiUpdateDomainConfig.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -57,6 +57,8 @@ import static java.util.concurrent.TimeUnit.MINUTES; 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.BASE_IMAGES_REPO_SECRET; import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_VERSION; @@ -173,8 +175,8 @@ public static void initAll(@Namespaces(2) List namespaces) { // create secret for admin credentials logger.info("Create secret for admin credentials"); String adminSecretName = "weblogic-credentials"; - assertDoesNotThrow(() -> createDomainSecret(adminSecretName,"weblogic", - "welcome1", domainNamespace), + assertDoesNotThrow(() -> createDomainSecret(adminSecretName, + ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT, domainNamespace), String.format("createSecret failed for %s", adminSecretName)); // create encryption secret @@ -270,12 +272,16 @@ void testMiiCustomEnv() { int adminServiceNodePort = getServiceNodePort(domainNamespace, getExternalServicePodName(adminServerPodName), "default"); - StringBuffer curlString = new StringBuffer("curl --user weblogic:welcome1 "); - curlString.append("\"http://" + K8S_NODEPORT_HOST + ":" + adminServiceNodePort) - .append("/management/weblogic/latest/domainConfig") - .append("/JMSServers/TestClusterJmsServer") - .append("?fields=notes&links=none\"") - .append(" --silent "); + StringBuffer curlString = new StringBuffer("curl --user ") + .append(ADMIN_USERNAME_DEFAULT) + .append(":") + .append(ADMIN_PASSWORD_DEFAULT) + .append(" ") + .append("\"http://" + K8S_NODEPORT_HOST + ":" + adminServiceNodePort) + .append("/management/weblogic/latest/domainConfig") + .append("/JMSServers/TestClusterJmsServer") + .append("?fields=notes&links=none\"") + .append(" --silent "); logger.info("checkJmsServerConfig: curl command {0}", new String(curlString)); verifyCommandResultContainsMsg(new String(curlString), "${DOMAIN_UID}~##!'%*$(ls)"); } @@ -1031,8 +1037,12 @@ private void verifyManagedServerConfiguration(String managedServer) { int adminServiceNodePort = getServiceNodePort(domainNamespace, getExternalServicePodName(adminServerPodName), "default"); - checkCluster = new StringBuffer("status=$(curl --user weblogic:welcome1 "); - checkCluster.append("http://" + K8S_NODEPORT_HOST + ":" + adminServiceNodePort) + checkCluster = new StringBuffer("status=$(curl --user ") + .append(ADMIN_USERNAME_DEFAULT) + .append(":") + .append(ADMIN_PASSWORD_DEFAULT) + .append(" ") + .append("http://" + K8S_NODEPORT_HOST + ":" + adminServiceNodePort) .append("/management/tenant-monitoring/servers/") .append(managedServer) .append(" --silent --show-error ") @@ -1075,14 +1085,17 @@ private void verifyJdbcRuntime(String resourcesName, String expectedOutput) { = getServiceNodePort(domainNamespace, getExternalServicePodName(adminServerPodName), "default"); ExecResult result = null; - curlString = new StringBuffer("curl --user weblogic:welcome1 "); - curlString.append("http://" + K8S_NODEPORT_HOST + ":" + adminServiceNodePort) + curlString = new StringBuffer("curl --user ") + .append(ADMIN_USERNAME_DEFAULT) + .append(":") + .append(ADMIN_PASSWORD_DEFAULT) + .append(" ") + .append("http://" + K8S_NODEPORT_HOST + ":" + adminServiceNodePort) .append("/management/wls/latest/datasources/id/") .append(resourcesName) .append("/") .append(" --silent --show-error "); logger.info("checkJdbcRuntime: curl command {0}", new String(curlString)); - verifyCommandResultContainsMsg(new String(curlString), expectedOutput); } diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporter.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporter.java index 45fedc370c7..dd5a6d7f261 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporter.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporter.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -1499,8 +1499,8 @@ private static void createAndVerifyDomain(String miiImage, createOcirRepoSecret(namespace); logger.info("Create secret for admin credentials"); String adminSecretName = "weblogic-credentials"; - assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, namespace, - "weblogic", "welcome1"), + assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, + namespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT), String.format("create secret for admin credentials failed for %s", adminSecretName)); // create encryption secret @@ -1708,10 +1708,12 @@ private static void changeConfigInPod(String podName, String namespace, String c "Copying file to pod failed"); execInPod(exporterPod, "monitoring-exporter", true, "curl -X PUT -H \"content-type: application/yaml\" --data-binary \"@/tmp/" - + configYaml + "\" -i -u weblogic:welcome1 http://localhost:8080/configuration"); + + configYaml + "\" -i -u " + ADMIN_USERNAME_DEFAULT + ":" + + ADMIN_PASSWORD_DEFAULT + + "http://localhost:8080/configuration"); execInPod(exporterPod, "monitoring-exporter", true, "curl -X GET " - + " -i -u weblogic:welcome1 http://localhost:8080/metrics"); - + + " -i -u " + ADMIN_USERNAME_DEFAULT + ":" + ADMIN_PASSWORD_DEFAULT + + "http://localhost:8080/metrics"); } /** @@ -2234,4 +2236,4 @@ private static String convertToJson(String yaml) { return new Gson().toJson(loadedYaml, LinkedHashMap.class); } -} \ No newline at end of file +} diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodTemplates.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodTemplates.java index 2b911da0bec..572173e4904 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodTemplates.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodTemplates.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -30,6 +30,8 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE; import static oracle.weblogic.kubernetes.TestConstants.OCIR_SECRET_NAME; @@ -204,8 +206,8 @@ private static void createAndVerifyDomain(String imageName, // create secret for admin credentials logger.info("Create secret for admin credentials"); String adminSecretName = "weblogic-credentials"; - assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, namespace, - "weblogic", "welcome1"), + assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, + namespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT), String.format("create secret for admin credentials failed for %s", adminSecretName)); // create encryption secret diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodsRestart.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodsRestart.java index fcb5ee88ee2..380c61abdce 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodsRestart.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodsRestart.java @@ -37,7 +37,9 @@ import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE; import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME; @@ -779,7 +781,8 @@ private static void createAndVerifyMiiDomain() { // create secret for admin credentials logger.info("Creating secret for admin credentials"); String adminSecretName = "weblogic-credentials"; - createSecretWithUsernamePassword(adminSecretName, domainNamespace, "weblogic", "welcome1"); + createSecretWithUsernamePassword(adminSecretName, domainNamespace, + ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT); // create encryption secret logger.info("Creating encryption secret"); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodsShutdownOption.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodsShutdownOption.java index 7e7fa2f8358..d2997cae5f6 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodsShutdownOption.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodsShutdownOption.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -31,7 +31,9 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE; import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME; @@ -116,7 +118,7 @@ public static void initAll(@Namespaces(2) List namespaces) { // create secret for admin credentials logger.info("Creating secret for admin credentials"); adminSecretName = "weblogic-credentials"; - createSecretWithUsernamePassword(adminSecretName, domainNamespace, "weblogic", "welcome1"); + createSecretWithUsernamePassword(adminSecretName, domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT); // create encryption secret logger.info("Creating encryption secret"); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItServerStartPolicy.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItServerStartPolicy.java index 986217a4945..3a605da19f5 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItServerStartPolicy.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItServerStartPolicy.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -46,6 +46,8 @@ import static java.util.concurrent.TimeUnit.MINUTES; 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.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_VERSION; import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST; @@ -166,8 +168,8 @@ public static void initAll(@Namespaces(2) List namespaces) { // create secret for admin credentials logger.info("Create secret for admin credentials"); String adminSecretName = "weblogic-credentials"; - assertDoesNotThrow(() -> createDomainSecret(adminSecretName,"weblogic", - "welcome1", domainNamespace), + assertDoesNotThrow(() -> createDomainSecret(adminSecretName, + ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT, domainNamespace), String.format("createSecret failed for %s", adminSecretName)); // create encryption secret @@ -1553,8 +1555,12 @@ private boolean checkManagedServerConfiguration(String ingressHost, String manag = getServiceNodePort(domainNamespace, getExternalServicePodName(adminServerPodName), "default"); String url = OKD ? ingressHost : K8S_NODEPORT_HOST + ":" + adminServiceNodePort; logger.info("url = {0}", url); - StringBuffer checkCluster = new StringBuffer("status=$(curl --user weblogic:welcome1 "); - checkCluster.append("http://" + url) + StringBuffer checkCluster = new StringBuffer("status=$(curl --user ") + .append(ADMIN_USERNAME_DEFAULT) + .append(":") + .append(ADMIN_PASSWORD_DEFAULT) + .append(" ") + .append("http://" + url) .append("/management/tenant-monitoring/servers/") .append(managedServer) .append(" --silent --show-error ") diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItStickySession.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItStickySession.java index fdbfbc120d1..fb2e3735bd8 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItStickySession.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItStickySession.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -46,6 +46,8 @@ import static java.util.concurrent.TimeUnit.MINUTES; 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.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST; import static oracle.weblogic.kubernetes.TestConstants.LOGS_DIR; @@ -384,8 +386,8 @@ private static void createAndVerifyDomain(String miiImage) { // create secret for admin credentials logger.info("Create secret for admin credentials"); String adminSecretName = "weblogic-credentials"; - assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, domainNamespace, - "weblogic", "welcome1"), + assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, + domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT), String.format("create secret for admin credentials failed for %s", adminSecretName)); // create encryption secret diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItUsabilityOperatorHelmChart.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItUsabilityOperatorHelmChart.java index 95ff06a6861..7c40a539b1e 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItUsabilityOperatorHelmChart.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItUsabilityOperatorHelmChart.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -40,7 +40,9 @@ import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE; +import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.DEFAULT_EXTERNAL_REST_IDENTITY_SECRET_NAME; import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION; import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST; @@ -863,7 +865,7 @@ private void createAndVerifyMiiDomain(String domainNamespace, String domainUid) // create secret for admin credentials logger.info("Creating secret for admin credentials"); String adminSecretName = "weblogic-credentials-" + domainUid; - createSecretWithUsernamePassword(adminSecretName, domainNamespace, "weblogic", "welcome1"); + createSecretWithUsernamePassword(adminSecretName, domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT); // create encryption secret logger.info("Creating encryption secret"); @@ -1183,8 +1185,12 @@ private boolean checkManagedServerConfiguration(String domainNamespace, String d String managedServer = "managed-server1"; int adminServiceNodePort = getServiceNodePort(domainNamespace, getExternalServicePodName(adminServerPodName), "default"); - StringBuffer checkCluster = new StringBuffer("status=$(curl --user weblogic:welcome1 "); - checkCluster.append("http://" + K8S_NODEPORT_HOST + ":" + adminServiceNodePort) + StringBuffer checkCluster = new StringBuffer("status=$(curl --user ") + .append(ADMIN_USERNAME_DEFAULT) + .append(":") + .append(ADMIN_PASSWORD_DEFAULT) + .append(" ") + .append("http://" + K8S_NODEPORT_HOST + ":" + adminServiceNodePort) .append("/management/tenant-monitoring/servers/") .append(managedServer) .append(" --silent --show-error ") diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Operator.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Operator.java index 6728edd1802..c48e307ae79 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Operator.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Operator.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes.actions.impl; @@ -79,8 +79,10 @@ public static String getImageName() { .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append) .toString(); } else { + // Remove all non-alphanumeric character(s) in the branch name + // e.g. replace release/3.x.y with release3xy CommandParams params = Command.defaultCommandParams() - .command("git branch | grep \\* | cut -d ' ' -f2-") + .command("git branch|grep \\* |cut -d ' ' -f2- |tr -dc 'a-zA-Z0-9'") .saveResults(true) .redirect(false); From 65256b3696a316ac67687e1703df9c6599d11eb6 Mon Sep 17 00:00:00 2001 From: "ANTARYAMI.PANIGRAHI@ORACLE.COM" Date: Sat, 29 Jan 2022 00:08:30 +0000 Subject: [PATCH 2/2] Test modification due to WDT 2.0 update --- .../java/oracle/weblogic/kubernetes/ItMiiDynamicUpdate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdate.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdate.java index f33dbaba2d7..b8bce986289 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdate.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdate.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2021, Oracle and/or its affiliates. +// Copyright (c) 2020, 2022, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -612,7 +612,7 @@ void testMiiDeleteAppChangeDBUrlWithCommitUpdateAndRoll() { Path pathToUndeployAppYaml = Paths.get(WORK_DIR + "/undeployapp.yaml"); String yamlToUndeployApp = "appDeployments:\n" + " Application:\n" - + " !myear:"; + + " '!myear':"; assertDoesNotThrow(() -> Files.write(pathToUndeployAppYaml, yamlToUndeployApp.getBytes()));