From c07553162ca02c87eded014bfd4da462cdd6ecab Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Wed, 14 Jul 2021 19:17:41 +0000 Subject: [PATCH 1/3] fix parallel nightly db issue --- .../test/java/oracle/weblogic/kubernetes/utils/DbUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java index 1f04c8d88bb..db0b728c25c 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java @@ -92,7 +92,7 @@ public class DbUtils { * @throws Exception if any error occurs when setting up RCU database */ - public static void setupDBandRCUschema(String dbImage, String fmwImage, String rcuSchemaPrefix, String dbNamespace, + public static synchronized void setupDBandRCUschema(String dbImage, String fmwImage, String rcuSchemaPrefix, String dbNamespace, int dbPort, String dbUrl) throws ApiException { LoggingFacade logger = getLogger(); // create pull secrets when running in non Kind Kubernetes cluster @@ -255,7 +255,7 @@ public static synchronized void startOracleDB(String dbBaseImageName, int dbPort * @param dbNamespace namespace of DB where RCU is * @throws ApiException when create RCU pod fails */ - public static void createRcuSchema(String fmwBaseImageName, String rcuPrefix, String dbUrl, + public static synchronized void createRcuSchema(String fmwBaseImageName, String rcuPrefix, String dbUrl, String dbNamespace) throws ApiException { LoggingFacade logger = getLogger(); logger.info("Create RCU pod for RCU prefix {0}", rcuPrefix); From 8f1db48d660ffce703388d2756c068a600466c62 Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Wed, 14 Jul 2021 19:46:01 +0000 Subject: [PATCH 2/3] fix checkstyle --- .../test/java/oracle/weblogic/kubernetes/utils/DbUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java index db0b728c25c..bbbf7bf3e28 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java @@ -92,7 +92,8 @@ public class DbUtils { * @throws Exception if any error occurs when setting up RCU database */ - public static synchronized void setupDBandRCUschema(String dbImage, String fmwImage, String rcuSchemaPrefix, String dbNamespace, + public static synchronized void setupDBandRCUschema(String dbImage, String fmwImage, String rcuSchemaPrefix, + String dbNamespace, int dbPort, String dbUrl) throws ApiException { LoggingFacade logger = getLogger(); // create pull secrets when running in non Kind Kubernetes cluster From 3e6ded58b8cb081c3602aefe54e254ad088bc036 Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Thu, 15 Jul 2021 17:29:22 +0000 Subject: [PATCH 3/3] wip --- integration-tests/pom.xml | 4 +++- kindtest.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index b8a1070f3b5..d9baf769d76 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -307,7 +307,9 @@ **/ItT3Channel, **/ItDedicatedMode, **/ItOpUpgradeFmwDomainInPV, - **/ItOperatorWlsUpgrade + **/ItOperatorWlsUpgrade, + **/ItFmwDynamicDomainInPV, + **/ItFmwDomainInPVUsingWDT diff --git a/kindtest.sh b/kindtest.sh index 74f65a77ab2..603c70bfb12 100755 --- a/kindtest.sh +++ b/kindtest.sh @@ -302,6 +302,6 @@ else time mvn -Dit.test="${test_filter}, !ItIstioCrossClusters*, !ItOCILoadBalancer" -Dwdt.download.url="${wdt_download_url}" -Dwit.download.url="${wit_download_url}" -Dwle.download.url="${wle_download_url}" -pl integration-tests -P ${maven_profile_name} verify 2>&1 | tee "${RESULT_ROOT}/kindtest.log" || captureLogs else echo "Running mvn -Dit.test=${test_filter}, !ItOperatorWlsUpgrade, !ItDedicatedMode, !ItT3Channel, !ItOpUpgradeFmwDomainInPV, !ItOCILoadBalancer, !ItIstioCrossClusters* -Dwdt.download.url=${wdt_download_url} -Dwit.download.url=${wit_download_url} -Dwle.download.url=${wle_download_url} -DPARALLEL_CLASSES=${parallel_run} -DNUMBER_OF_THREADS=${threads} -pl integration-tests -P ${maven_profile_name} verify" - time mvn -Dit.test="${test_filter}, !ItOperatorWlsUpgrade, !ItDedicatedMode, !ItT3Channel, !ItOpUpgradeFmwDomainInPV, !ItOCILoadBalancer, !ItIstioCrossClusters*" -Dwdt.download.url="${wdt_download_url}" -Dwit.download.url="${wit_download_url}" -Dwle.download.url="${wle_download_url}" -DPARALLEL_CLASSES="${parallel_run}" -DNUMBER_OF_THREADS="${threads}" -pl integration-tests -P ${maven_profile_name} verify 2>&1 | tee "${RESULT_ROOT}/kindtest.log" || captureLogs + time mvn -Dit.test="${test_filter}, !ItOperatorWlsUpgrade, !ItFmwDomainInPVUsingWDT, !ItFmwDynamicDomainInPV, !ItDedicatedMode, !ItT3Channel, !ItOpUpgradeFmwDomainInPV, !ItOCILoadBalancer, !ItIstioCrossClusters*" -Dwdt.download.url="${wdt_download_url}" -Dwit.download.url="${wit_download_url}" -Dwle.download.url="${wle_download_url}" -DPARALLEL_CLASSES="${parallel_run}" -DNUMBER_OF_THREADS="${threads}" -pl integration-tests -P ${maven_profile_name} verify 2>&1 | tee "${RESULT_ROOT}/kindtest.log" || captureLogs fi fi