Skip to content

Improve stability of DB creation in parallel nightly run #2461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 19, 2021
Merged

Improve stability of DB creation in parallel nightly run #2461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c075531
fix parallel nightly db issue
maggiehe00 Jul 14, 2021
8f1db48
fix checkstyle
maggiehe00 Jul 14, 2021
3e6ded5
wip
maggiehe00 Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,9 @@
**/ItT3Channel,
**/ItDedicatedMode,
**/ItOpUpgradeFmwDomainInPV,
**/ItOperatorWlsUpgrade
**/ItOperatorWlsUpgrade,
**/ItFmwDynamicDomainInPV,
**/ItFmwDomainInPVUsingWDT
</includes-failsafe>
</properties>
</profile>
Expand Down
5 changes: 3 additions & 2 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ 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
Expand Down Expand Up @@ -255,7 +256,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);
Expand Down
2 changes: 1 addition & 1 deletion kindtest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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