Skip to content

Commit 1f84002

Browse files
authored
Improve stability of DB creation in parallel nightly run (#2461)
* fix parallel nightly db issue
1 parent 7af1132 commit 1f84002

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

integration-tests/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,9 @@
307307
**/ItT3Channel,
308308
**/ItDedicatedMode,
309309
**/ItOpUpgradeFmwDomainInPV,
310-
**/ItOperatorWlsUpgrade
310+
**/ItOperatorWlsUpgrade,
311+
**/ItFmwDynamicDomainInPV,
312+
**/ItFmwDomainInPVUsingWDT
311313
</includes-failsafe>
312314
</properties>
313315
</profile>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ public class DbUtils {
9292
* @throws Exception if any error occurs when setting up RCU database
9393
*/
9494

95-
public static void setupDBandRCUschema(String dbImage, String fmwImage, String rcuSchemaPrefix, String dbNamespace,
95+
public static synchronized void setupDBandRCUschema(String dbImage, String fmwImage, String rcuSchemaPrefix,
96+
String dbNamespace,
9697
int dbPort, String dbUrl) throws ApiException {
9798
LoggingFacade logger = getLogger();
9899
// create pull secrets when running in non Kind Kubernetes cluster
@@ -255,7 +256,7 @@ public static synchronized void startOracleDB(String dbBaseImageName, int dbPort
255256
* @param dbNamespace namespace of DB where RCU is
256257
* @throws ApiException when create RCU pod fails
257258
*/
258-
public static void createRcuSchema(String fmwBaseImageName, String rcuPrefix, String dbUrl,
259+
public static synchronized void createRcuSchema(String fmwBaseImageName, String rcuPrefix, String dbUrl,
259260
String dbNamespace) throws ApiException {
260261
LoggingFacade logger = getLogger();
261262
logger.info("Create RCU pod for RCU prefix {0}", rcuPrefix);

kindtest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,6 @@ else
306306
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
307307
else
308308
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"
309-
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
309+
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
310310
fi
311311
fi

0 commit comments

Comments
 (0)