Skip to content

Commit a01953e

Browse files
Sankar Periyathambi NeelakandanSankar Periyathambi Neelakandan
authored andcommitted
enable domain in image tests in quicktest and dsisable multiple clusters tests in quick test
1 parent 68834c1 commit a01953e

File tree

2 files changed

+28
-20
lines changed

2 files changed

+28
-20
lines changed

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

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,22 @@ public class ITMultipleClusters extends BaseTest {
4545
*/
4646
@BeforeClass
4747
public static void staticPrepare() throws Exception {
48-
// initialize test properties and create the directories
49-
initialize(APP_PROPS_FILE);
50-
String template =
51-
BaseTest.getProjectRoot() + "/kubernetes/samples/scripts/common/domain-template.yaml";
52-
String add =
53-
" - clusterName: %CLUSTER_NAME%-2\n"
54-
+ " serverStartState: \"RUNNING\"\n"
55-
+ " replicas: %INITIAL_MANAGED_SERVER_REPLICAS%\n";
56-
customDomainTemplate = BaseTest.getResultDir() + "/customDomainTemplate.yaml";
57-
Files.copy(
58-
Paths.get(template), Paths.get(customDomainTemplate), StandardCopyOption.REPLACE_EXISTING);
59-
Files.write(Paths.get(customDomainTemplate), add.getBytes(), StandardOpenOption.APPEND);
48+
if (!QUICKTEST) {
49+
// initialize test properties and create the directories
50+
initialize(APP_PROPS_FILE);
51+
String template =
52+
BaseTest.getProjectRoot() + "/kubernetes/samples/scripts/common/domain-template.yaml";
53+
String add =
54+
" - clusterName: %CLUSTER_NAME%-2\n"
55+
+ " serverStartState: \"RUNNING\"\n"
56+
+ " replicas: %INITIAL_MANAGED_SERVER_REPLICAS%\n";
57+
customDomainTemplate = BaseTest.getResultDir() + "/customDomainTemplate.yaml";
58+
Files.copy(
59+
Paths.get(template),
60+
Paths.get(customDomainTemplate),
61+
StandardCopyOption.REPLACE_EXISTING);
62+
Files.write(Paths.get(customDomainTemplate), add.getBytes(), StandardOpenOption.APPEND);
63+
}
6064
}
6165

6266
/**
@@ -66,13 +70,14 @@ public static void staticPrepare() throws Exception {
6670
*/
6771
@AfterClass
6872
public static void staticUnPrepare() throws Exception {
69-
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
70-
logger.info("BEGIN");
71-
logger.info("Run once, release cluster lease");
72-
tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
73-
logger.info("SUCCESS");
73+
if (!QUICKTEST) {
74+
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
75+
logger.info("BEGIN");
76+
logger.info("Run once, release cluster lease");
77+
tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
78+
logger.info("SUCCESS");
79+
}
7480
}
75-
7681
/**
7782
* Create 2 configured clusters in a domain each having 2 managed servers. Verify the managed
7883
* servers are running and verify the basic use cases.
@@ -81,6 +86,7 @@ public static void staticUnPrepare() throws Exception {
8186
*/
8287
@Test
8388
public void testCreateDomainTwoConfiguredCluster() throws Exception {
89+
Assume.assumeFalse(QUICKTEST);
8490

8591
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
8692
logTestBegin(testMethodName);
@@ -138,6 +144,7 @@ public void testCreateDomainTwoConfiguredCluster() throws Exception {
138144
*/
139145
@Test
140146
public void testCreateDomainTwoMixedCluster() throws Exception {
147+
Assume.assumeFalse(QUICKTEST);
141148
String DOMAINUID = "twomixedclusterdomain";
142149
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
143150
logTestBegin(testMethodName);
@@ -194,6 +201,7 @@ public void testCreateDomainTwoMixedCluster() throws Exception {
194201
*/
195202
@Test
196203
public void testCreateDomainTwoClusterWDTInImage() throws Exception {
204+
Assume.assumeFalse(QUICKTEST);
197205
String DOMAINUID = "twoclusterdomainwdt";
198206
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
199207
logTestBegin(testMethodName);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ public void testOperatorRESTUsingCertificateChain() throws Exception {
437437
*/
438438
@Test
439439
public void testDomainInImageUsingWLST() throws Exception {
440-
Assume.assumeFalse(QUICKTEST);
440+
Assume.assumeTrue(QUICKTEST);
441441
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
442442
logTestBegin(testMethodName);
443443

@@ -469,7 +469,7 @@ public void testDomainInImageUsingWLST() throws Exception {
469469
*/
470470
@Test
471471
public void testDomainInImageUsingWDT() throws Exception {
472-
Assume.assumeFalse(QUICKTEST);
472+
Assume.assumeTrue(QUICKTEST);
473473
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
474474
logTestBegin(testMethodName);
475475

0 commit comments

Comments
 (0)