@@ -51,25 +51,25 @@ public class ItPodsRestart extends BaseTest {
51
51
*/
52
52
@ BeforeClass
53
53
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
+ }
73
73
}
74
74
75
75
/**
@@ -79,16 +79,16 @@ public static void staticPrepare() throws Exception {
79
79
*/
80
80
@ AfterClass
81
81
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" );
86
86
87
- destroyPodsRestartdomain ();
88
- tearDown (new Object () {}.getClass ().getEnclosingClass ().getSimpleName ());
87
+ destroyPodsRestartdomain ();
88
+ tearDown (new Object () {}.getClass ().getEnclosingClass ().getSimpleName ());
89
89
90
- logger .info ("SUCCESS" );
91
- }
90
+ logger .info ("SUCCESS" );
91
+ }
92
92
}
93
93
94
94
private static Domain createPodsRestartdomain () throws Exception {
@@ -207,7 +207,9 @@ public void testServerPodsRestartByChangingIncludeServerOutInPodLog() throws Exc
207
207
* Modify the domain scope property on the domain resource using kubectl apply -f domain.yaml
208
208
* Verify that all the server pods in the domain got re-started .The property tested is: image:
209
209
* "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
211
213
*
212
214
* @throws Exception exception
213
215
*/
@@ -226,10 +228,12 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
226
228
+ getWeblogicImageName ()
227
229
+ ":"
228
230
+ getWeblogicImageTag ()
229
- );
231
+ + " to "
232
+ + "/weblogick8s/middleware/weblogic:duplicate" );
230
233
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" ;
233
237
// apply new domain yaml and verify pod restart
234
238
domain .verifyDomainServerPodRestart (
235
239
"\" " + getWeblogicImageName () + ":" + getWeblogicImageTag () + "\" " ,
@@ -469,7 +473,7 @@ public void testClusterRestartVersion() throws Exception {
469
473
* @throws Exception when domain.yaml cannot be read or modified to include the
470
474
* restartVersion:v1.1
471
475
*/
472
- //@Test
476
+ // @Test
473
477
public void testMsRestartVersion () throws Exception {
474
478
Assume .assumeFalse (QUICKTEST );
475
479
String testMethodName = new Object () {}.getClass ().getEnclosingMethod ().getName ();
0 commit comments