Skip to content

Commit 74ed993

Browse files
committed
Made changes based on comments jenkins-ignore
1 parent 464ff9d commit 74ed993

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

integration-tests/USECASES.MD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Configuration Overrides Usecases
9696

9797
| Server Discovery | Use Case |
9898
| --- | --- |
99-
| Discover a newly started server | Stop operator and apply the modified domain.yaml with replicas count increated, restart Operator and verify that the cluster is scaled up accordingly |
99+
| Discover a newly started server | Stop operator and apply the modified domain.yaml with replicas count increased, restart Operator and verify that the cluster is scaled up accordingly |
100100
| Discover dead weblogic servers | Stop Operator, kill admin server and all managed servers in the cluster, restart Operator and verify that it restarts all dead servers |
101101

102102
| Sticky Session | Use Case |

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,15 @@ public static void staticPrepare() throws Exception {
8989
*/
9090
@AfterClass
9191
public static void staticUnPrepare() throws Exception {
92-
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
93-
logger.info("BEGIN");
94-
logger.info("Run once, release cluster lease");
92+
if (!QUICKTEST) {
93+
logger.info("++++++++++++++++++++++++++++++++++");
94+
logger.info("BEGIN");
95+
logger.info("Run once, release cluster lease");
9596

96-
tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
97+
tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
9798

98-
logger.info("SUCCESS");
99+
logger.info("SUCCESS");
100+
}
99101
}
100102

101103
/**

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,15 @@ public static void staticPrepare() throws Exception {
9090
*/
9191
@AfterClass
9292
public static void staticUnPrepare() throws Exception {
93-
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
94-
logger.info("BEGIN");
95-
logger.info("Run once, release cluster lease");
93+
if (!QUICKTEST) {
94+
logger.info("++++++++++++++++++++++++++++++++++");
95+
logger.info("BEGIN");
96+
logger.info("Run once, release cluster lease");
9697

97-
tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
98+
tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
9899

99-
logger.info("SUCCESS");
100+
logger.info("SUCCESS");
101+
}
100102
}
101103

102104
/**
@@ -251,13 +253,11 @@ public void testDiffSessionsNoSharing() throws Exception {
251253

252254
private String getHttpResponseAttribute(String httpResponseString, String attribute)
253255
throws Exception {
254-
255256
String attrPatn = httpAttrMap.get(attribute);
256257

257258
Assume.assumeNotNull(attrPatn);
258259

259260
String httpAttribute = null;
260-
261261
Pattern pattern = Pattern.compile(attrPatn);
262262
Matcher matcher = pattern.matcher(httpResponseString);
263263

@@ -274,7 +274,6 @@ private ExecResult getHTTPResponse(String webServiceURL, String... args) throws
274274
// Send a HTTP request
275275
String curlCmd = buildWebServiceUrl(webServiceURL, headerOption);
276276
logger.info("Send a HTTP request: " + curlCmd);
277-
278277
ExecResult result = TestUtils.exec(curlCmd);
279278

280279
return result;

0 commit comments

Comments
 (0)