Skip to content

Commit cd1867d

Browse files
committed
Mark it no QuickTest
1 parent 0fed8fb commit cd1867d

File tree

1 file changed

+26
-18
lines changed

1 file changed

+26
-18
lines changed

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

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import oracle.kubernetes.operator.utils.TestUtils;
2121
import org.junit.After;
2222
import org.junit.AfterClass;
23+
import org.junit.Assume;
2324
import org.junit.FixMethodOrder;
2425
import org.junit.Test;
2526
import org.junit.runners.MethodSorters;
@@ -89,25 +90,27 @@ private void setupOperatorAndDomain(String operatorGitRelease, String operatorRe
8990
*/
9091
@After
9192
public void cleanupOperatorAndDomain() throws Exception {
92-
logger.log(Level.INFO, "+++++++++++++++Beginning AfterTest cleanup+++++++++++++++++++++");
93-
if (domain != null) {
94-
domain.destroy();
95-
}
96-
if (operator != null) {
97-
operator.destroy();
93+
if (!QUICKTEST) {
94+
logger.log(Level.INFO, "+++++++++++++++Beginning AfterTest cleanup+++++++++++++++++++++");
95+
if (domain != null) {
96+
domain.destroy();
97+
}
98+
if (operator != null) {
99+
operator.destroy();
100+
}
101+
ExecResult result = cleanup();
102+
TestUtils.exec(
103+
"kubectl delete pods,services,deployments,replicasets,configmaps,services --all --ignore-not-found -n "
104+
+ OP_NS);
105+
TestUtils.exec(
106+
"kubectl delete pods,services,deployments,replicasets,configmaps,services --all --ignore-not-found -n "
107+
+ DOM_NS);
108+
TestUtils.exec("kubectl delete crd --all --ignore-not-found");
109+
TestUtils.exec("kubectl delete ns " + OP_NS + " --ignore-not-found");
110+
TestUtils.exec("kubectl delete ns " + DOM_NS + " --ignore-not-found");
111+
TestUtils.exec("kubectl get all --all-namespaces");
112+
logger.log(Level.INFO, "+++++++++++++++Done AfterTest cleanup+++++++++++++++++++++");
98113
}
99-
ExecResult result = cleanup();
100-
TestUtils.exec(
101-
"kubectl delete pods,services,deployments,replicasets,configmaps,services --all --ignore-not-found -n "
102-
+ OP_NS);
103-
TestUtils.exec(
104-
"kubectl delete pods,services,deployments,replicasets,configmaps,services --all --ignore-not-found -n "
105-
+ DOM_NS);
106-
TestUtils.exec("kubectl delete crd --all --ignore-not-found");
107-
TestUtils.exec("kubectl delete ns " + OP_NS + " --ignore-not-found");
108-
TestUtils.exec("kubectl delete ns " + DOM_NS + " --ignore-not-found");
109-
TestUtils.exec("kubectl get all --all-namespaces");
110-
logger.log(Level.INFO, "+++++++++++++++Done AfterTest cleanup+++++++++++++++++++++");
111114
}
112115

113116
/**
@@ -133,6 +136,7 @@ public static void staticUnPrepare() throws Exception {
133136
*/
134137
@Test
135138
public void testOperatorUpgradeFrom2_0() throws Exception {
139+
Assume.assumeFalse(QUICKTEST);
136140
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
137141
logTestBegin(testMethod);
138142
OP_NS = "weblogic-operator20";
@@ -152,6 +156,7 @@ public void testOperatorUpgradeFrom2_0() throws Exception {
152156
*/
153157
@Test
154158
public void testOperatorUpgradeFrom2_0_1() throws Exception {
159+
Assume.assumeFalse(QUICKTEST);
155160
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
156161
logTestBegin(testMethod);
157162
OP_NS = "weblogic-operator201";
@@ -171,6 +176,7 @@ public void testOperatorUpgradeFrom2_0_1() throws Exception {
171176
*/
172177
@Test
173178
public void testOperatorUpgradeFrom2_1() throws Exception {
179+
Assume.assumeFalse(QUICKTEST);
174180
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
175181
logTestBegin(testMethod);
176182
OP_NS = "weblogic-operator21";
@@ -190,6 +196,7 @@ public void testOperatorUpgradeFrom2_1() throws Exception {
190196
*/
191197
@Test
192198
public void testOperatorUpgradeFrom2_2_0() throws Exception {
199+
Assume.assumeFalse(QUICKTEST);
193200
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
194201
logTestBegin(testMethod);
195202
OP_NS = "weblogic-operator220";
@@ -209,6 +216,7 @@ public void testOperatorUpgradeFrom2_2_0() throws Exception {
209216
*/
210217
@Test
211218
public void testOperatorUpgradeFrom2_2_1() throws Exception {
219+
Assume.assumeFalse(QUICKTEST);
212220
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
213221
logTestBegin(testMethod);
214222
OP_NS = "weblogic-operator221";

0 commit comments

Comments
 (0)