|
48 | 48 |
|
49 | 49 | import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT; |
50 | 50 | import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT; |
| 51 | +import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_PREFIX; |
51 | 52 | import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_PREFIX; |
52 | 53 | import static oracle.weblogic.kubernetes.TestConstants.ENCRYPION_PASSWORD_DEFAULT; |
53 | 54 | import static oracle.weblogic.kubernetes.TestConstants.ENCRYPION_USERNAME_DEFAULT; |
54 | 55 | import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST; |
55 | 56 | import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_APP_NAME; |
56 | 57 | import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER_PRIVATEIP; |
57 | 58 | import static oracle.weblogic.kubernetes.TestConstants.SSL_PROPERTIES; |
58 | | -import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME; |
| 59 | +import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME_DEFAULT; |
59 | 60 | import static oracle.weblogic.kubernetes.actions.ActionConstants.ARCHIVE_DIR; |
60 | 61 | import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR; |
61 | 62 | import static oracle.weblogic.kubernetes.actions.ActionConstants.WORK_DIR; |
@@ -232,7 +233,7 @@ void testUpgrade1411to1412ProdOff() { |
232 | 233 |
|
233 | 234 | // create auxiliary domain creation image |
234 | 235 | String auxImage = createAuxImage(auxImageName, auxImageTag, wdtModelFile.toString(), wdtVariableFile.toString()); |
235 | | - String baseImage = WEBLOGIC_IMAGE_NAME + ":" + imageTag1411; |
| 236 | + String baseImage = BASE_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag1411; |
236 | 237 | //name of channel available in domain configuration |
237 | 238 | String channelName = "default"; |
238 | 239 | //create a MII domain resource with the auxiliary image |
@@ -315,7 +316,7 @@ void testUpgrade1411to1412ProdOnSecOff() { |
315 | 316 |
|
316 | 317 | // create auxiliary domain creation image |
317 | 318 | String auxImage = createAuxImage(auxImageName, auxImageTag, wdtModelFile.toString(), wdtVariableFile.toString()); |
318 | | - String baseImage = WEBLOGIC_IMAGE_NAME + ":" + imageTag1411; |
| 319 | + String baseImage = BASE_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag1411; |
319 | 320 | //name of channel available in domain configuration |
320 | 321 | String channelName = "default"; |
321 | 322 | // create auxiliary domain creation image |
@@ -398,7 +399,7 @@ void testUpgrade1411to1412ProdOnSecOn() { |
398 | 399 |
|
399 | 400 | // create auxiliary domain creation image |
400 | 401 | String auxImage = createAuxImage(auxImageName, auxImageTag, wdtModelFile.toString(), wdtVariableFile.toString()); |
401 | | - String baseImage = WEBLOGIC_IMAGE_NAME + ":" + imageTag1411; |
| 402 | + String baseImage = BASE_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag1411; |
402 | 403 | //name of channel available in domain configuration |
403 | 404 | String channelName = "internal-admin"; |
404 | 405 | //create a MII domain resource with the auxiliary image |
@@ -483,7 +484,7 @@ void testUpgrade1411to1412ProdOnSecNotConfigured() { |
483 | 484 |
|
484 | 485 | // create auxiliary domain creation image |
485 | 486 | String auxImage = createAuxImage(auxImageName, auxImageTag, wdtModelFile.toString(), wdtVariableFile.toString()); |
486 | | - String baseImage = WEBLOGIC_IMAGE_NAME + ":" + imageTag1411; |
| 487 | + String baseImage = BASE_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag1411; |
487 | 488 | //name of channel available in domain configuration |
488 | 489 | String channelName = "internal-admin"; |
489 | 490 | //create a MII domain resource with the auxiliary image |
@@ -566,13 +567,13 @@ void testUpgrade12214to1412ProdOff() { |
566 | 567 | Files.writeString(wdtVariableFile, "AdministrationPortEnabled=false\n", StandardOpenOption.APPEND); |
567 | 568 | }); |
568 | 569 |
|
569 | | - String auxImageName = DOMAIN_IMAGES_PREFIX + "dci-prod1411off"; |
| 570 | + String auxImageName = DOMAIN_IMAGES_PREFIX + "dci-prod12214off"; |
570 | 571 | String auxImageTag = getDateAndTimeStamp(); |
571 | 572 | Path wdtModelFile = Paths.get(RESOURCE_DIR, "securemodeupgrade", "upgrade-model_1.yaml"); |
572 | 573 |
|
573 | 574 | // create auxiliary domain creation image |
574 | 575 | String auxImage = createAuxImage(auxImageName, auxImageTag, wdtModelFile.toString(), wdtVariableFile.toString()); |
575 | | - String baseImage = WEBLOGIC_IMAGE_NAME + ":" + imageTag12214; |
| 576 | + String baseImage = BASE_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag12214; |
576 | 577 | //name of channel available in domain configuration |
577 | 578 | String channelName = "default"; |
578 | 579 | //create a MII domain resource with the auxiliary image |
@@ -657,7 +658,7 @@ void testUpgrade12214to1412ProdOn() { |
657 | 658 |
|
658 | 659 | // create auxiliary domain creation image |
659 | 660 | String auxImage = createAuxImage(auxImageName, auxImageTag, wdtModelFile.toString(), wdtVariableFile.toString()); |
660 | | - String baseImage = WEBLOGIC_IMAGE_NAME + ":" + imageTag12214; |
| 661 | + String baseImage = BASE_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag12214; |
661 | 662 | //name of channel available in domain configuration |
662 | 663 | String channelName = "internal-admin"; |
663 | 664 | //create a MII domain resource with the auxiliary image |
|
0 commit comments