Skip to content

Commit 92fb7b0

Browse files
committed
minor update
1 parent 9128f5c commit 92fb7b0

File tree

1 file changed

+36
-32
lines changed

1 file changed

+36
-32
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/ItPodsRestart.java

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,25 @@ public class ItPodsRestart extends BaseTest {
5151
*/
5252
@BeforeClass
5353
public static void staticPrepare() throws Exception {
54-
// initialize test properties and create the directories
55-
if (!QUICKTEST) {
56-
initialize(APP_PROPS_FILE);
57-
58-
logger.info("Checking if operator1 and domain are running, if not creating");
59-
if (operator1 == null) {
60-
operator1 = TestUtils.createOperator(OPERATOR1_YAML);
61-
}
62-
restartTmpDir = BaseTest.getResultDir() + "/restarttemp";
63-
Files.createDirectories(Paths.get(restartTmpDir));
64-
65-
domain = createPodsRestartdomain();
66-
originalYaml =
67-
BaseTest.getUserProjectsDir()
68-
+ "/weblogic-domains/"
69-
+ domain.getDomainUid()
70-
+ "/domain.yaml";
71-
Assert.assertNotNull(domain);
72-
}
54+
// initialize test properties and create the directories
55+
if (!QUICKTEST) {
56+
initialize(APP_PROPS_FILE);
57+
58+
logger.info("Checking if operator1 and domain are running, if not creating");
59+
if (operator1 == null) {
60+
operator1 = TestUtils.createOperator(OPERATOR1_YAML);
61+
}
62+
restartTmpDir = BaseTest.getResultDir() + "/restarttemp";
63+
Files.createDirectories(Paths.get(restartTmpDir));
64+
65+
domain = createPodsRestartdomain();
66+
originalYaml =
67+
BaseTest.getUserProjectsDir()
68+
+ "/weblogic-domains/"
69+
+ domain.getDomainUid()
70+
+ "/domain.yaml";
71+
Assert.assertNotNull(domain);
72+
}
7373
}
7474

7575
/**
@@ -79,16 +79,16 @@ public static void staticPrepare() throws Exception {
7979
*/
8080
@AfterClass
8181
public static void staticUnPrepare() throws Exception {
82-
if (!QUICKTEST) {
83-
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
84-
logger.info("BEGIN");
85-
logger.info("Run once, release cluster lease");
82+
if (!QUICKTEST) {
83+
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
84+
logger.info("BEGIN");
85+
logger.info("Run once, release cluster lease");
8686

87-
destroyPodsRestartdomain();
88-
tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
87+
destroyPodsRestartdomain();
88+
tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
8989

90-
logger.info("SUCCESS");
91-
}
90+
logger.info("SUCCESS");
91+
}
9292
}
9393

9494
private static Domain createPodsRestartdomain() throws Exception {
@@ -207,7 +207,9 @@ public void testServerPodsRestartByChangingIncludeServerOutInPodLog() throws Exc
207207
* Modify the domain scope property on the domain resource using kubectl apply -f domain.yaml
208208
* Verify that all the server pods in the domain got re-started .The property tested is: image:
209209
* "container-registry.oracle.com/middleware/weblogic:12.2.1.3" --> image:
210-
* "container-registry.oracle.com/middleware/weblogic:duplicate"
210+
* "container-registry.oracle.com/middleware/weblogic:duplicate" for internal env
211+
* "container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev" for external shared cluster
212+
* env
211213
*
212214
* @throws Exception exception
213215
*/
@@ -226,10 +228,12 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
226228
+ getWeblogicImageName()
227229
+ ":"
228230
+ getWeblogicImageTag()
229-
);
231+
+ " to "
232+
+ "/weblogick8s/middleware/weblogic:duplicate");
230233

231-
if (BaseTest.SHARED_CLUSTER) {
232-
String newImage = getWeblogicImageServer()+ "/middleware/weblogic:12.2.1.3-dev";
234+
if (BaseTest.SHARED_CLUSTER) {
235+
String newImage =
236+
getWeblogicImageServer()+ "/middleware/weblogic:12.2.1.3-dev";
233237
// apply new domain yaml and verify pod restart
234238
domain.verifyDomainServerPodRestart(
235239
"\"" + getWeblogicImageName() + ":" + getWeblogicImageTag() + "\"",
@@ -469,7 +473,7 @@ public void testClusterRestartVersion() throws Exception {
469473
* @throws Exception when domain.yaml cannot be read or modified to include the
470474
* restartVersion:v1.1
471475
*/
472-
//@Test
476+
// @Test
473477
public void testMsRestartVersion() throws Exception {
474478
Assume.assumeFalse(QUICKTEST);
475479
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();

0 commit comments

Comments
 (0)