Skip to content

Commit 4ef8163

Browse files
committed
Merge branch 'OWLS-128603-main' into 'main'
port WDTArchiveHelper changes from release/4.2 See merge request weblogic-cloud/weblogic-kubernetes-operator!4984
2 parents d658dc7 + ff31acf commit 4ef8163

File tree

2 files changed

+369
-5
lines changed

2 files changed

+369
-5
lines changed

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33

44
package oracle.weblogic.kubernetes;
55

6+
import java.io.IOException;
67
import java.util.ArrayList;
78
import java.util.Collections;
89
import java.util.List;
910

1011
import oracle.weblogic.domain.AuxiliaryImage;
1112
import oracle.weblogic.domain.DomainResource;
13+
import oracle.weblogic.kubernetes.actions.impl.WDTArchiveHelper;
1214
import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
1315
import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
1416
import oracle.weblogic.kubernetes.actions.impl.primitive.WitParams;
@@ -43,7 +45,6 @@
4345
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
4446
import static oracle.weblogic.kubernetes.actions.ActionConstants.ARCHIVE_DIR;
4547
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
46-
import static oracle.weblogic.kubernetes.actions.TestActions.buildAppArchive;
4748
import static oracle.weblogic.kubernetes.actions.TestActions.defaultAppParams;
4849
import static oracle.weblogic.kubernetes.actions.TestActions.deleteImage;
4950
import static oracle.weblogic.kubernetes.assertions.TestAssertions.appAccessibleInPod;
@@ -126,10 +127,18 @@ static void initAll(@Namespaces(2) List<String> namespaces) {
126127
ENCRYPION_USERNAME_DEFAULT, ENCRYPION_PASSWORD_DEFAULT);
127128

128129
// build app
129-
assertTrue(buildAppArchive(defaultAppParams()
130-
.srcDirList(Collections.singletonList(MII_BASIC_APP_NAME))
131-
.appName(MII_BASIC_APP_NAME)),
132-
String.format("Failed to create app archive for %s", MII_BASIC_APP_NAME));
130+
try {
131+
// createArchive app
132+
assertTrue(WDTArchiveHelper
133+
.withParams(defaultAppParams()
134+
.srcDirList(Collections.singletonList(MII_BASIC_APP_NAME))
135+
.appName(MII_BASIC_APP_NAME))
136+
.createArchive(),
137+
String.format("Failed to create app archive for %s", MII_BASIC_APP_NAME));
138+
} catch (IOException ex) {
139+
getLogger().severe(ex.getLocalizedMessage());
140+
}
141+
133142
}
134143

135144
/**

0 commit comments

Comments
 (0)