Skip to content

Commit 7dce5df

Browse files
committed
check for QUICKTEST, call statedump.sh in wercker.yml
1 parent ec42a5c commit 7dce5df

File tree

3 files changed

+31
-11
lines changed

3 files changed

+31
-11
lines changed

integration-tests/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,6 @@
9292
<executable>${resource-integration-test}/setupenv.sh</executable>
9393
</configuration>
9494
</execution>
95-
<execution><!-- dump pod, domain, etc logs -->
96-
<id>statedump</id>
97-
<phase>post-integration-test</phase>
98-
<goals>
99-
<goal>exec</goal>
100-
</goals>
101-
<configuration>
102-
<executable>${resource-integration-test}/statedump.sh</executable>
103-
</configuration>
104-
</execution>
10595
</executions>
10696
</plugin>
10797
<plugin>

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

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import oracle.kubernetes.operator.utils.Operator;
99
import oracle.kubernetes.operator.utils.TestUtils;
1010
import org.junit.AfterClass;
11+
import org.junit.Assume;
1112
import org.junit.BeforeClass;
1213
import org.junit.FixMethodOrder;
1314
import org.junit.Test;
@@ -79,7 +80,7 @@ public void test1CreateOperatorManagingDefaultAndTest1NS() throws Exception {
7980
logger.info("Creating Operator & waiting for the script to complete execution");
8081
// create operator1
8182
operator1 = TestUtils.createOperator(op1PropsFile);
82-
logger.info("SUCCESS");
83+
logger.info("SUCCESS");
8384
}
8485

8586
@Test
@@ -96,6 +97,9 @@ public void test2CreateDomainInDefaultNS() throws Exception {
9697

9798
@Test
9899
public void test3CreateAnotherDomainInDefaultNS() throws Exception {
100+
Assume.assumeFalse(
101+
System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true"));
102+
99103
logTestBegin("test3CreateAnotherDomainInDefaultNS");
100104
logger.info("Creating Domain domain2 & verifing the domain creation");
101105
// create domain2
@@ -108,6 +112,9 @@ public void test3CreateAnotherDomainInDefaultNS() throws Exception {
108112

109113
@Test
110114
public void test4CreateDomainInTest1NS() throws Exception {
115+
Assume.assumeFalse(
116+
System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true"));
117+
111118
logTestBegin("test4CreateDomainInTest1NS");
112119
logger.info("Creating Domain domain3 & verifing the domain creation");
113120
// create domain3
@@ -117,6 +124,9 @@ public void test4CreateDomainInTest1NS() throws Exception {
117124

118125
@Test
119126
public void test5CreateAnotherOperatorManagingTest2NS() throws Exception {
127+
Assume.assumeFalse(
128+
System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true"));
129+
120130
logTestBegin("test5CreateAnotherOperatorManagingTest2NS");
121131
logger.info("Creating Operator & waiting for the script to complete execution");
122132
// create operator2
@@ -126,6 +136,9 @@ public void test5CreateAnotherOperatorManagingTest2NS() throws Exception {
126136

127137
@Test
128138
public void test6CreateConfiguredDomainInTest2NS() throws Exception {
139+
Assume.assumeFalse(
140+
System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true"));
141+
129142
logTestBegin("test6CreateDomainInTest2NS");
130143
logger.info("Creating Domain domain4 & verifing the domain creation");
131144
// create domain4
@@ -150,6 +163,9 @@ public void test6CreateConfiguredDomainInTest2NS() throws Exception {
150163

151164
@Test
152165
public void test7CreateDomainWithStartupControlAdmin() throws Exception {
166+
Assume.assumeFalse(
167+
System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true"));
168+
153169
logTestBegin("test7CreateDomainWithStartupControlAdmin");
154170
logger.info("Creating Domain domain5 & verifing the domain creation");
155171
// create domain5
@@ -159,6 +175,9 @@ public void test7CreateDomainWithStartupControlAdmin() throws Exception {
159175

160176
@Test
161177
public void test8CreateDomainPVReclaimPolicyRecycle() throws Exception {
178+
Assume.assumeFalse(
179+
System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true"));
180+
162181
logTestBegin("test8CreateDomainPVReclaimPolicyRecycle");
163182
logger.info("Creating Domain domain6 & verifing the domain creation");
164183
// create domain6
@@ -170,6 +189,9 @@ public void test8CreateDomainPVReclaimPolicyRecycle() throws Exception {
170189

171190
@Test
172191
public void test9WlsLivenessProbe() throws Exception {
192+
Assume.assumeFalse(
193+
System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true"));
194+
173195
logTestBegin("test9WlsLivenessProbe");
174196
// test managed server1 pod auto restart
175197
String domain = domain1.getDomainUid();
@@ -181,6 +203,9 @@ public void test9WlsLivenessProbe() throws Exception {
181203

182204
@Test
183205
public void testACreateDomainOnExistingDir() throws Exception {
206+
Assume.assumeFalse(
207+
System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true"));
208+
184209
logTestBegin("test10CreateDomainOnExistingDir");
185210
logger.info("domain1 " + domain1);
186211
// create domain on existing dir
@@ -191,6 +216,8 @@ public void testACreateDomainOnExistingDir() throws Exception {
191216

192217
@Test
193218
public void testBCreateDomainApacheLB() throws Exception {
219+
Assume.assumeFalse(
220+
System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true"));
194221
logTestBegin("test11CreateDomainApacheLB");
195222
logger.info("Creating Domain domain7 & verifing the domain creation");
196223
// create domain7

wercker.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,9 @@ integration-test-java:
298298
code: |
299299
#!/bin/bash
300300
function cleanup_and_store {
301+
302+
$WERCKER_SOURCE_DIR/integration-tests/src/test/resources/statedump.sh
303+
301304
# clean up
302305
yum clean all
303306

0 commit comments

Comments
 (0)