Skip to content

Commit c87440d

Browse files
rjeberhardrjeberhard
committed
Merge branch 'xc-113425-main' into 'main'
Fix Multiple tests create app archive at the same time using same directory See merge request weblogic-cloud/weblogic-kubernetes-operator!4494
2 parents 779d7e5 + 3674239 commit c87440d

13 files changed

+141
-100
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/verrazzano/weblogic/kubernetes/ItVzWlsDomainOnPV.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import oracle.weblogic.domain.DomainOnPV;
3939
import oracle.weblogic.domain.DomainOnPVType;
4040
import oracle.weblogic.domain.DomainResource;
41+
import oracle.weblogic.kubernetes.actions.impl.AppParams;
4142
import oracle.weblogic.kubernetes.actions.impl.primitive.WitParams;
4243
import oracle.weblogic.kubernetes.annotations.Namespaces;
4344
import oracle.weblogic.kubernetes.logging.LoggingFacade;
@@ -307,12 +308,13 @@ private DomainCreationImage createDomainCreationImage() {
307308
// create image with model and wdt installation files
308309
// build an application archive using what is in resources/apps/APP_NAME
309310
logger.info("Build an application archive using resources/apps/{0}", appName);
310-
assertTrue(buildAppArchive(defaultAppParams()
311+
AppParams appParams = defaultAppParams().appArchiveDir(ARCHIVE_DIR + this.getClass().getSimpleName());
312+
assertTrue(buildAppArchive(appParams
311313
.srcDirList(Collections.singletonList(appName))),
312314
String.format("Failed to create app archive for %s", appName));
313315

314316
// build the archive list
315-
String zipFile = String.format("%s/%s.zip", ARCHIVE_DIR, appName);
317+
String zipFile = String.format("%s/%s.zip", appParams.appArchiveDir(), appName);
316318
final List<String> archiveList = Collections.singletonList(zipFile);
317319
WitParams witParams
318320
= new WitParams()

‎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;
@@ -88,6 +89,8 @@ class ItAuxV8DomainImplicitUpgrade {
8889
private static Map<String, OffsetDateTime> podsWithTimeStamps = null;
8990
private boolean foundCompatiblityContainer = false;
9091
private String domainUid = "implicit-upg";
92+
private static AppParams appParams = defaultAppParams()
93+
.appArchiveDir(ARCHIVE_DIR + ItAuxV8DomainImplicitUpgrade.class.getSimpleName());
9194

9295
/**
9396
* Install Operator.
@@ -128,7 +131,7 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
128131
ENCRYPION_USERNAME_DEFAULT, ENCRYPION_PASSWORD_DEFAULT);
129132

130133
// build app
131-
assertTrue(buildAppArchive(defaultAppParams()
134+
assertTrue(buildAppArchive(appParams
132135
.srcDirList(Collections.singletonList(MII_BASIC_APP_NAME))
133136
.appName(MII_BASIC_APP_NAME)),
134137
String.format("Failed to create app archive for %s", MII_BASIC_APP_NAME));
@@ -167,7 +170,7 @@ void testMultipleAuxImagesV8Domain() {
167170
String modelOnlyImage = MII_AUXILIARY_IMAGE_NAME + ":" + modelOnlyImageTag;
168171
String wdtOnlyImage = MII_AUXILIARY_IMAGE_NAME + ":" + wdtOnlyImageTag;
169172
String configOnlyImage = MII_AUXILIARY_IMAGE_NAME + ":" + configOnlyImageTag;
170-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
173+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
171174

172175
List<String> modelList = new ArrayList<>();
173176
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -510,7 +513,7 @@ void testUpdateBaseImageV8AuxDomain() {
510513
deleteDomainResource(domainNamespace, domainUid);
511514
}
512515

513-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
516+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
514517
List<String> modelList = new ArrayList<>();
515518
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
516519
modelList.add(MODEL_DIR + "/model.jms2.yaml");

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItLargeMiiDomainsClusters.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.kubernetes.client.openapi.models.V1ResourceRequirements;
2424
import io.kubernetes.client.openapi.models.V1ServiceAccount;
2525
import oracle.weblogic.domain.DomainResource;
26+
import oracle.weblogic.kubernetes.actions.impl.AppParams;
2627
import oracle.weblogic.kubernetes.actions.impl.OperatorParams;
2728
import oracle.weblogic.kubernetes.actions.impl.primitive.HelmParams;
2829
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
@@ -219,13 +220,16 @@ void testCreateNDomainsNClusters() {
219220
createSecrets(domainNamespaces.get(i));
220221

221222
// build app
222-
assertTrue(buildAppArchive(defaultAppParams()
223+
AppParams appParams = defaultAppParams()
224+
.appArchiveDir(ARCHIVE_DIR + this.getClass().getSimpleName());
225+
assertTrue(buildAppArchive(appParams
223226
.srcDirList(Collections.singletonList(MII_BASIC_APP_NAME))
224227
.appName(MII_BASIC_APP_NAME)),
225228
String.format("Failed to create app archive for %s", MII_BASIC_APP_NAME));
226229

227230
// image with model files for domain config, app and wdt install files
228-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
231+
List<String> archiveList
232+
= Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
229233

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

‎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;
@@ -193,17 +194,20 @@ void testCreateMiiDomainWithClusterFromOnPremDomain() {
193194
List<String> appDirList = Collections.singletonList("onprem-app");
194195

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

204207
//copy file from stage dir to where the config files are
205208
try {
206-
copy(Paths.get(ARCHIVE_DIR, "/wlsdeploy/applications/opdemo.ear"), Paths.get(DOMAIN_TEMP_DIR, "/opdemo.ear"));
209+
copy(Paths.get(appParams.appArchiveDir(), "/wlsdeploy/applications/opdemo.ear"),
210+
Paths.get(DOMAIN_TEMP_DIR, "/opdemo.ear"));
207211
} catch (IOException ioex) {
208212
logger.info("Copy of the application to the domain directory failed");
209213
}

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import io.kubernetes.client.openapi.ApiException;
1818
import oracle.weblogic.domain.AuxiliaryImage;
1919
import oracle.weblogic.domain.DomainResource;
20+
import oracle.weblogic.kubernetes.actions.impl.AppParams;
2021
import oracle.weblogic.kubernetes.actions.impl.primitive.WitParams;
2122
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
2223
import oracle.weblogic.kubernetes.annotations.Namespaces;
@@ -184,6 +185,8 @@ class ItMiiAuxiliaryImage {
184185
private static String opNamespace = null;
185186
private static String operatorPodName = null;
186187
private static String oldMiiAuxImageNameInDomain1 = miiAuxiliaryImage1;
188+
private static AppParams appParams = defaultAppParams()
189+
.appArchiveDir(ARCHIVE_DIR + ItMiiAuxiliaryImage.class.getSimpleName());
187190

188191
/**
189192
* Install Operator. Create a domain using multiple auxiliary images.
@@ -238,13 +241,13 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
238241
createSecretWithUsernamePassword(encryptionSecretName, errorpathDomainNamespace,
239242
"weblogicenc", "weblogicenc");
240243
// build app
241-
assertTrue(buildAppArchive(defaultAppParams()
244+
assertTrue(buildAppArchive(appParams
242245
.srcDirList(Collections.singletonList(MII_BASIC_APP_NAME))
243246
.appName(MII_BASIC_APP_NAME)),
244247
String.format("Failed to create app archive for %s", MII_BASIC_APP_NAME));
245248

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

249252
List<String> modelList = new ArrayList<>();
250253
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -334,7 +337,7 @@ void testUpdateDataSourceInDomainUsingAuxiliaryImage() {
334337
"/multi-model-one-ds.20.yaml").toString(), "ORCLCDB",
335338
"dbsvc"), "Can't replace datasource url in the model file");
336339

337-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
340+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
338341

339342
List<String> modelList = new ArrayList<>();
340343
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -540,7 +543,7 @@ void testCreateDomainNoFilesAtSourceWDTInstallHome() {
540543

541544
// creating image with no WDT install files
542545

543-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
546+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
544547

545548
List<String> modelList = new ArrayList<>();
546549
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -597,7 +600,7 @@ void testSourceWDTInstallHomeSetAtMultipleAIs() {
597600
//createAuxiliaryImageWithDomainConfig(miiAuxiliaryImage6, auxiliaryImagePathCustom);
598601

599602
// admin/managed server name here should match with model yaml
600-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
603+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
601604

602605
List<String> modelList = new ArrayList<>();
603606
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -733,7 +736,7 @@ void testCreateDomainWithConfigMapAndEmptyModelFileDir() {
733736
String domainUid = "testdomain8";
734737
String adminServerPodName = domainUid + "-admin-server";
735738
String managedServerPrefix = domainUid + "-managed-server";
736-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
739+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
737740

738741
WitParams witParams =
739742
new WitParams()
@@ -785,7 +788,7 @@ void testCreateDomainWithEmptyConfigMapWithNoModelFiles() {
785788
String domainUid = "testdomain9";
786789
String adminServerPodName = domainUid + "-admin-server";
787790
String managedServerPrefix = domainUid + "-managed-server";
788-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
791+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
789792

790793
WitParams witParams =
791794
new WitParams()
@@ -967,7 +970,7 @@ void testErrorPathDomainMissingWDTBinary() {
967970
}
968971
OffsetDateTime timestamp = now();
969972

970-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
973+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
971974

972975
List<String> modelList = new ArrayList<>();
973976
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -1039,7 +1042,7 @@ void testErrorPathDomainMissingDomainConfig() {
10391042
final String auxiliaryImagePath = "/auxiliary";
10401043
OffsetDateTime timestamp = now();
10411044

1042-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
1045+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
10431046

10441047
List<String> modelList = new ArrayList<>();
10451048
modelList.add(MODEL_DIR + "/model.jms2.yaml");
@@ -1110,7 +1113,7 @@ void testErrorPathFilePermission() {
11101113

11111114
OffsetDateTime timestamp = now();
11121115

1113-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
1116+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
11141117

11151118
List<String> modelList = new ArrayList<>();
11161119
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -1197,7 +1200,7 @@ void testUpdateWDTVersionUsingMultipleAuxiliaryImages() {
11971200
createSecretWithUsernamePassword(encryptionSecretName, wdtDomainNamespace,
11981201
"weblogicenc", "weblogicenc");
11991202

1200-
List<String> archiveList = Collections.singletonList(ARCHIVE_DIR + "/" + MII_BASIC_APP_NAME + ".zip");
1203+
List<String> archiveList = Collections.singletonList(appParams.appArchiveDir() + "/" + MII_BASIC_APP_NAME + ".zip");
12011204

12021205
List<String> modelList = new ArrayList<>();
12031206
modelList.add(MODEL_DIR + "/multi-model-one-ds.20.yaml");
@@ -1389,17 +1392,14 @@ void testUpdateApplicationUsingAI() {
13891392

13901393
logger.info("Build an application archive using what is in {0}", appDirList);
13911394
assertTrue(
1392-
buildAppArchive(
1393-
defaultAppParams()
1394-
.srcDirList(appDirList)),
1395-
String.format("Failed to create application archive for %s",
1396-
MII_BASIC_APP_NAME));
1395+
buildAppArchive(appParams.srcDirList(appDirList)),
1396+
String.format("Failed to create application archive for %s", MII_BASIC_APP_NAME));
13971397

13981398
logger.info("Build the archive list that contains {0}",
1399-
String.format("%s/%s.zip", ARCHIVE_DIR, MII_BASIC_APP_NAME));
1399+
String.format("%s/%s.zip", appParams.appArchiveDir(), MII_BASIC_APP_NAME));
14001400
List<String> archiveList =
14011401
Collections.singletonList(
1402-
String.format("%s/%s.zip", ARCHIVE_DIR, MII_BASIC_APP_NAME));
1402+
String.format("%s/%s.zip", appParams.appArchiveDir(), MII_BASIC_APP_NAME));
14031403

14041404
List<String> modelList = new ArrayList<>();
14051405
modelList.add(MODEL_DIR + "/" + MII_BASIC_WDT_MODEL_FILE);
@@ -1517,7 +1517,7 @@ private void createDomainUsingAuxImageWithCustomWdtModelHomeInstallHome(String w
15171517
String domainUid,
15181518
String imageTag) {
15191519

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

15221522
List<String> modelList = new ArrayList<>();
15231523
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,

0 commit comments

Comments
 (0)