Skip to content

Commit a5546b6

Browse files
committed
code cleanup
1 parent 5f200ff commit a5546b6

File tree

2 files changed

+2
-28
lines changed

2 files changed

+2
-28
lines changed

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,7 @@ public static void staticUnPrepare() throws Exception {
9696
System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true"));
9797
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
9898
logger.info("BEGIN");
99-
// logger.info("Run once, shutdown/deleting operator, domain, pv, etc");
100-
101-
// shutdown operator, domain and cleanup all artifacts and pv dir
102-
/*try {
103-
if (domain != null) domain.destroy();
104-
if (operator != null) operator.destroy();
105-
} finally {
106-
107-
ExecResult result = cleanup();
108-
if (result.exitValue() != 0) {
109-
logger.info("FAILED: Command to call cleanup script failed " + result.stderr());
110-
}
111-
logger.info("Command to call cleanup script returned " + result.stdout() + "\n" + result.stderr());
112-
} */
99+
logger.info("Run once, release cluster lease");
113100

114101
if (getLeaseId() != "") {
115102
logger.info("Release the k8s cluster lease");

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,26 +83,13 @@ public static void staticPrepare() throws Exception {
8383
public static void staticUnPrepare() throws Exception {
8484
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
8585
logger.info("BEGIN");
86-
// logger.info("Run once, shutdown/deleting operator, domain, pv, etc");
86+
logger.info("Run once, release cluster lease");
8787

8888
if (getLeaseId() != "") {
8989
logger.info("Release the k8s cluster lease");
9090
TestUtils.releaseLease(getProjectRoot(), getLeaseId());
9191
}
9292

93-
// shutdown operator, domain and cleanup all artifacts and pv dir
94-
/* try {
95-
if (domain != null) domain.destroy();
96-
if (operator != null) operator.destroy();
97-
} finally {
98-
//delete k8s artifacts created if any, delete PV directories
99-
ExecResult result = cleanup();
100-
if (result.exitValue() != 0) {
101-
throw new RuntimeException("FAILED: Command to call cleanup script failed " + result.stderr());
102-
}
103-
logger.info("Command to call cleanup script returned " + result.stdout() + "\n" + result.stderr());
104-
105-
} */
10693
logger.info("SUCCESS");
10794
}
10895
/**

0 commit comments

Comments
 (0)