Skip to content

Commit 4cbcff1

Browse files
committed
Merge branch 'dboperator-fix' into 'release/4.0'
shutdown the WebLogic domain before attempting to shutdown the database See merge request weblogic-cloud/weblogic-kubernetes-operator!4444
2 parents fbe0f98 + 6f1858a commit 4cbcff1

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDBOperator.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.kubernetes.client.openapi.models.V1LocalObjectReference;
1616
import oracle.weblogic.domain.ClusterResource;
1717
import oracle.weblogic.domain.DomainResource;
18+
import oracle.weblogic.kubernetes.actions.TestActions;
1819
import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
1920
import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
2021
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
@@ -502,7 +503,9 @@ private void testMiiJmsJtaServiceMigration() {
502503
*/
503504
@AfterAll
504505
public void tearDownAll() throws ApiException {
505-
if (!SKIP_CLEANUP) {
506+
if (!SKIP_CLEANUP) {
507+
TestActions.shutdownDomain(fmwDomainUid, fmwDomainNamespace);
508+
TestActions.shutdownDomain(wlsDomainUid, wlsDomainNamespace);
506509
deleteOracleDB(dbNamespace, dbName);
507510
uninstallDBOperator(dbNamespace);
508511
}

0 commit comments

Comments
 (0)