Skip to content

Commit 4417c7f

Browse files
committed
backport MR 4494 to release/4.1
1 parent 3a3b413 commit 4417c7f

File tree

10 files changed

+123
-87
lines changed

10 files changed

+123
-87
lines changed

integration-tests/src/test/java/oracle/verrazzano/weblogic/kubernetes/ItVzMiiDomain.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import oracle.verrazzano.weblogic.WorkloadSpec;
2828
import oracle.verrazzano.weblogic.kubernetes.annotations.VzIntegrationTest;
2929
import oracle.weblogic.domain.DomainResource;
30+
import oracle.weblogic.kubernetes.actions.impl.AppParams;
3031
import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
3132
import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
3233
import oracle.weblogic.kubernetes.actions.impl.primitive.WitParams;
@@ -252,13 +253,14 @@ void testVzMiiAuxilaryImage() {
252253
"weblogicenc", "weblogicenc");
253254

254255
// build app
255-
assertTrue(buildAppArchive(defaultAppParams()
256+
AppParams appParams = defaultAppParams().appArchiveDir(ARCHIVE_DIR + this.getClass().getSimpleName());
257+
assertTrue(buildAppArchive(appParams
256258
.srcDirList(Collections.singletonList(MII_BASIC_APP_NAME))
257259
.appName(MII_BASIC_APP_NAME)),
258260
String.format("Failed to create app archive for %s", MII_BASIC_APP_NAME));
259261

260262
// image1 with model files for domain config, ds, app and wdt install files
261-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
263+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
262264

263265
List<String> modelList = new ArrayList<>();
264266
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import io.kubernetes.client.openapi.models.V1Container;
1616
import oracle.weblogic.domain.DomainResource;
17+
import oracle.weblogic.kubernetes.actions.impl.AppParams;
1718
import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
1819
import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
1920
import oracle.weblogic.kubernetes.actions.impl.primitive.WitParams;
@@ -89,6 +90,8 @@ class ItAuxV8DomainImplicitUpgrade {
8990
private static Map<String, OffsetDateTime> podsWithTimeStamps = null;
9091
private boolean foundCompatiblityContainer = false;
9192
private String domainUid = "implicit-upg";
93+
private static AppParams appParams = defaultAppParams()
94+
.appArchiveDir(ARCHIVE_DIR + ItAuxV8DomainImplicitUpgrade.class.getSimpleName());
9295

9396
/**
9497
* Install Operator.
@@ -129,7 +132,7 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
129132
ENCRYPION_USERNAME_DEFAULT, ENCRYPION_PASSWORD_DEFAULT);
130133

131134
// build app
132-
assertTrue(buildAppArchive(defaultAppParams()
135+
assertTrue(buildAppArchive(appParams
133136
.srcDirList(Collections.singletonList(MII_BASIC_APP_NAME))
134137
.appName(MII_BASIC_APP_NAME)),
135138
String.format("Failed to create app archive for %s", MII_BASIC_APP_NAME));
@@ -169,7 +172,7 @@ void testMultipleAuxImagesV8Domain() {
169172
String modelOnlyImage = MII_AUXILIARY_IMAGE_NAME + ":" + modelOnlyImageTag;
170173
String wdtOnlyImage = MII_AUXILIARY_IMAGE_NAME + ":" + wdtOnlyImageTag;
171174
String configOnlyImage = MII_AUXILIARY_IMAGE_NAME + ":" + configOnlyImageTag;
172-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
175+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
173176

174177
List<String> modelList = new ArrayList<>();
175178
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -512,7 +515,7 @@ void testUpdateBaseImageV8AuxDomain() {
512515
deleteDomainResource(domainNamespace, domainUid);
513516
}
514517

515-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
518+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
516519
List<String> modelList = new ArrayList<>();
517520
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
518521
modelList.add(MODEL_DIR + "/model.jms2.yaml");

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import io.kubernetes.client.openapi.models.V1EnvVar;
1717
import io.kubernetes.client.openapi.models.V1Pod;
1818
import io.kubernetes.client.util.exception.CopyNotSupportedException;
19+
import oracle.weblogic.kubernetes.actions.impl.AppParams;
1920
import oracle.weblogic.kubernetes.actions.impl.Exec;
2021
import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
2122
import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
@@ -190,17 +191,20 @@ void testCreateMiiDomainWithClusterFromOnPremDomain() {
190191
List<String> appDirList = Collections.singletonList("onprem-app");
191192

192193
logger.info("Build the application archive using what is in {0}", appDirList);
194+
AppParams appParams = defaultAppParams()
195+
.appArchiveDir(ARCHIVE_DIR + this.getClass().getSimpleName());
193196
assertTrue(
194197
buildAppArchive(
195-
defaultAppParams()
198+
appParams
196199
.srcDirList(appDirList)
197200
.appName("opdemo")),
198201
String.format("Failed to create application archive for %s",
199202
"opdemo"));
200203

201204
//copy file from stage dir to where the config files are
202205
try {
203-
copy(Paths.get(ARCHIVE_DIR, "/wlsdeploy/applications/opdemo.ear"), Paths.get(DOMAIN_TEMP_DIR, "/opdemo.ear"));
206+
copy(Paths.get(appParams.appArchiveDir(), "/wlsdeploy/applications/opdemo.ear"),
207+
Paths.get(DOMAIN_TEMP_DIR, "/opdemo.ear"));
204208
} catch (IOException ioex) {
205209
logger.info("Copy of the application to the domain directory failed");
206210
}

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import io.kubernetes.client.openapi.ApiException;
1717
import oracle.weblogic.domain.AuxiliaryImage;
1818
import oracle.weblogic.domain.DomainResource;
19+
import oracle.weblogic.kubernetes.actions.impl.AppParams;
1920
import oracle.weblogic.kubernetes.actions.impl.primitive.WitParams;
2021
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
2122
import oracle.weblogic.kubernetes.annotations.Namespaces;
@@ -176,6 +177,9 @@ class ItMiiAuxiliaryImage {
176177
private static String encryptionSecretName = "encryptionsecret";
177178
private static String opNamespace = null;
178179
private static String operatorPodName = null;
180+
private static String oldMiiAuxImageNameInDomain1 = miiAuxiliaryImage1;
181+
private static AppParams appParams = defaultAppParams()
182+
.appArchiveDir(ARCHIVE_DIR + ItMiiAuxiliaryImage.class.getSimpleName());
179183

180184
/**
181185
* Install Operator. Create a domain using multiple auxiliary images.
@@ -230,13 +234,13 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
230234
createSecretWithUsernamePassword(encryptionSecretName, errorpathDomainNamespace,
231235
"weblogicenc", "weblogicenc");
232236
// build app
233-
assertTrue(buildAppArchive(defaultAppParams()
237+
assertTrue(buildAppArchive(appParams
234238
.srcDirList(Collections.singletonList(MII_BASIC_APP_NAME))
235239
.appName(MII_BASIC_APP_NAME)),
236240
String.format("Failed to create app archive for %s", MII_BASIC_APP_NAME));
237241

238242
// image1 with model files for domain config, ds, app and wdt install files
239-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
243+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
240244

241245
List<String> modelList = new ArrayList<>();
242246
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -326,7 +330,7 @@ void testUpdateDataSourceInDomainUsingAuxiliaryImage() {
326330
"/multi-model-one-ds.20.yaml").toString(), "ORCLCDB",
327331
"dbsvc"), "Can't replace datasource url in the model file");
328332

329-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
333+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
330334

331335
List<String> modelList = new ArrayList<>();
332336
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -534,7 +538,7 @@ void testCreateDomainNoFilesAtSourceWDTInstallHome() {
534538

535539
// creating image with no WDT install files
536540

537-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
541+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
538542

539543
List<String> modelList = new ArrayList<>();
540544
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -591,7 +595,7 @@ void testSourceWDTInstallHomeSetAtMultipleAIs() {
591595
//createAuxiliaryImageWithDomainConfig(miiAuxiliaryImage6, auxiliaryImagePathCustom);
592596

593597
// admin/managed server name here should match with model yaml
594-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
598+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
595599

596600
List<String> modelList = new ArrayList<>();
597601
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -727,7 +731,7 @@ void testCreateDomainWithConfigMapAndEmptyModelFileDir() {
727731
String domainUid = "testdomain8";
728732
String adminServerPodName = domainUid + "-admin-server";
729733
String managedServerPrefix = domainUid + "-managed-server";
730-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
734+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
731735

732736
WitParams witParams =
733737
new WitParams()
@@ -779,7 +783,7 @@ void testCreateDomainWithEmptyConfigMapWithNoModelFiles() {
779783
String domainUid = "testdomain9";
780784
String adminServerPodName = domainUid + "-admin-server";
781785
String managedServerPrefix = domainUid + "-managed-server";
782-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
786+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
783787

784788
WitParams witParams =
785789
new WitParams()
@@ -965,7 +969,7 @@ void testErrorPathDomainMissingWDTBinary() {
965969
}
966970
OffsetDateTime timestamp = now();
967971

968-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
972+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
969973

970974
List<String> modelList = new ArrayList<>();
971975
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -1037,7 +1041,7 @@ void testErrorPathDomainMissingDomainConfig() {
10371041
final String auxiliaryImagePath = "/auxiliary";
10381042
OffsetDateTime timestamp = now();
10391043

1040-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
1044+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
10411045

10421046
List<String> modelList = new ArrayList<>();
10431047
modelList.add(MODEL_DIR + "/model.jms2.yaml");
@@ -1108,7 +1112,7 @@ void testErrorPathFilePermission() {
11081112

11091113
OffsetDateTime timestamp = now();
11101114

1111-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
1115+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
11121116

11131117
List<String> modelList = new ArrayList<>();
11141118
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -1195,7 +1199,7 @@ void testUpdateWDTVersionUsingMultipleAuxiliaryImages() {
11951199
createSecretWithUsernamePassword(encryptionSecretName, wdtDomainNamespace,
11961200
"weblogicenc", "weblogicenc");
11971201

1198-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
1202+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
11991203

12001204
List<String> modelList = new ArrayList<>();
12011205
modelList.add(MODEL_DIR + "/multi-model-one-ds.20.yaml");
@@ -1466,7 +1470,7 @@ private void createDomainUsingAuxImageWithCustomWdtModelHomeInstallHome(String w
14661470
String domainUid,
14671471
String imageTag) {
14681472

1469-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
1473+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
14701474

14711475
List<String> modelList = new ArrayList<>();
14721476
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import oracle.weblogic.domain.Model;
2929
import oracle.weblogic.domain.ServerPod;
3030
import oracle.weblogic.domain.ServerService;
31+
import oracle.weblogic.kubernetes.actions.impl.AppParams;
3132
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
3233
import oracle.weblogic.kubernetes.annotations.Namespaces;
3334
import oracle.weblogic.kubernetes.logging.LoggingFacade;
@@ -148,6 +149,7 @@ class ItMiiDomain {
148149
private static volatile boolean mainThreadDone = false;
149150
private static String miiDomainNegativeNamespace = null;
150151
private String encryptionSecretName = "encryptionsecret";
152+
private AppParams appParams = defaultAppParams().appArchiveDir(ARCHIVE_DIR + this.getClass().getSimpleName());
151153

152154
/**
153155
* Install Operator.
@@ -713,18 +715,16 @@ private String updateImageWithAppV2Patch(
713715
Collections.singletonList(String.format("%s/%s", MODEL_DIR, MII_BASIC_WDT_MODEL_FILE));
714716

715717
logger.info("Build an application archive using what is in {0}", appDirList);
718+
716719
assertTrue(
717-
buildAppArchive(
718-
defaultAppParams()
719-
.srcDirList(appDirList)),
720-
String.format("Failed to create application archive for %s",
721-
MII_BASIC_APP_NAME));
720+
buildAppArchive(appParams.srcDirList(appDirList)),
721+
String.format("Failed to create application archive for %s", MII_BASIC_APP_NAME));
722722

723723
logger.info("Build the archive list that contains {0}",
724-
String.format("%s/%s.zip", ARCHIVE_DIR, MII_BASIC_APP_NAME));
724+
String.format("%s/%s.zip", appParams.appArchiveDir(), MII_BASIC_APP_NAME));
725725
List<String> archiveList =
726726
Collections.singletonList(
727-
String.format("%s/%s.zip", ARCHIVE_DIR, MII_BASIC_APP_NAME));
727+
String.format("%s/%s.zip", appParams.appArchiveDir(), MII_BASIC_APP_NAME));
728728

729729
return createImageAndVerify(
730730
imageName,
@@ -748,7 +748,7 @@ private String updateImageWithSampleApp3(
748748
logger.info("Build the first application archive using what is in {0}", appDirList1);
749749
assertTrue(
750750
buildAppArchive(
751-
defaultAppParams()
751+
appParams
752752
.srcDirList(appDirList1)
753753
.appName(appName1)),
754754
String.format("Failed to create application archive for %s",
@@ -757,18 +757,18 @@ private String updateImageWithSampleApp3(
757757
logger.info("Build the second application archive usingt what is in {0}", appDirList2);
758758
assertTrue(
759759
buildAppArchive(
760-
defaultAppParams()
760+
appParams
761761
.srcDirList(appDirList2)
762762
.appName(appName2)),
763763
String.format("Failed to create application archive for %s",
764764
appName2));
765765

766766
logger.info("Build the archive list with two zip files: {0} and {1}",
767-
String.format("%s/%s.zip", ARCHIVE_DIR, appName1),
768-
String.format("%s/%s.zip", ARCHIVE_DIR, appName2));
767+
String.format("%s/%s.zip", appParams.appArchiveDir(), appName1),
768+
String.format("%s/%s.zip", appParams.appArchiveDir(), appName2));
769769
List<String> archiveList = Arrays.asList(
770-
String.format("%s/%s.zip", ARCHIVE_DIR, appName1),
771-
String.format("%s/%s.zip", ARCHIVE_DIR, appName2));
770+
String.format("%s/%s.zip", appParams.appArchiveDir(), appName1),
771+
String.format("%s/%s.zip", appParams.appArchiveDir(), appName2));
772772

773773
return createImageAndVerify(
774774
imageName,

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.concurrent.Callable;
1111

1212
import oracle.weblogic.domain.DomainResource;
13+
import oracle.weblogic.kubernetes.actions.impl.AppParams;
1314
import oracle.weblogic.kubernetes.annotations.DisabledOnSlimImage;
1415
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
1516
import oracle.weblogic.kubernetes.annotations.Namespaces;
@@ -254,13 +255,16 @@ private DomainResource createDomainUsingAuxiliaryImage() {
254255
"weblogicenc", "weblogicenc");
255256

256257
// build app
257-
assertTrue(buildAppArchive(defaultAppParams()
258-
.srcDirList(Collections.singletonList(MII_BASIC_APP_NAME))
259-
.appName(MII_BASIC_APP_NAME)),
258+
AppParams appParams = defaultAppParams()
259+
.srcDirList(Collections.singletonList(MII_BASIC_APP_NAME))
260+
.appArchiveDir(ARCHIVE_DIR + this.getClass().getSimpleName())
261+
.appName(MII_BASIC_APP_NAME);
262+
263+
assertTrue(buildAppArchive(appParams),
260264
String.format("Failed to create app archive for %s", MII_BASIC_APP_NAME));
261265

262266
// image1 with model files for domain config, ds, app and wdt install files
263-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
267+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
264268

265269
List<String> modelList = new ArrayList<>();
266270
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import oracle.weblogic.domain.DomainSpec;
2222
import oracle.weblogic.domain.Model;
2323
import oracle.weblogic.domain.ServerPod;
24+
import oracle.weblogic.kubernetes.actions.impl.AppParams;
2425
import oracle.weblogic.kubernetes.actions.impl.NginxParams;
2526
import oracle.weblogic.kubernetes.annotations.DisabledOnSlimImage;
2627
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
@@ -496,9 +497,12 @@ private static DomainResource createDomainOnPvUsingWdt(String domainUid, String
496497
appSrcDirList.add(WLDF_OPENSESSION_APP);
497498

498499
for (String appName : appSrcDirList) {
499-
assertTrue(buildAppArchive(defaultAppParams()
500-
.srcDirList(Collections.singletonList(appName))
501-
.appName(appName)),
500+
AppParams appParams = defaultAppParams()
501+
.srcDirList(Collections.singletonList(appName))
502+
.appArchiveDir(ARCHIVE_DIR + ItMultiDomainModelsScale.class.getSimpleName())
503+
.appName(appName);
504+
505+
assertTrue(buildAppArchive(appParams),
502506
String.format("Failed to create app archive for %s", appName));
503507

504508
logger.info("Getting port for default channel");
@@ -509,7 +513,7 @@ private static DomainResource createDomainOnPvUsingWdt(String domainUid, String
509513
assertNotEquals(-1, defaultChannelPort, "admin server defaultChannelPort is not valid");
510514

511515
//deploy application
512-
Path archivePath = get(ARCHIVE_DIR, "wlsdeploy", "applications", appName + ".ear");
516+
Path archivePath = get(appParams.appArchiveDir(), "wlsdeploy", "applications", appName + ".ear");
513517
logger.info("Deploying webapp {0} to domain {1}", archivePath, domainUid);
514518
deployUsingWlst(adminServerPodName, Integer.toString(defaultChannelPort),
515519
ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT, clusterName + "," + ADMIN_SERVER_NAME_BASE, archivePath,

0 commit comments

Comments
 (0)