Skip to content

Commit 9b311a8

Browse files
sankarpnsankarpn
committed
Adding changes by Vanaja
1 parent b8c58cb commit 9b311a8

File tree

3 files changed

+101
-95
lines changed

3 files changed

+101
-95
lines changed

‎integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

Lines changed: 51 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at
33
// http://oss.oracle.com/licenses/upl.
4-
54
package oracle.kubernetes.operator;
65

76
import java.nio.file.Files;
@@ -25,6 +24,7 @@
2524
* extend this class.
2625
*/
2726
public class BaseTest {
27+
2828
public static final Logger logger = Logger.getLogger("OperatorIT", "OperatorIT");
2929
public static final String TESTWEBAPP = "testwebapp";
3030

@@ -97,18 +97,9 @@ public static void initialize(String appPropsFile) throws Exception {
9797
+ clnResult.stderr());
9898
}
9999
// create resultRoot, PVRoot, etc
100-
if (Files.notExists(Paths.get(resultRoot))) {
101-
logger.log(Level.INFO, "Creating {0}", resultRoot);
102-
Files.createDirectories(Paths.get(resultRoot));
103-
}
104-
if (Files.notExists(Paths.get(resultDir))) {
105-
logger.log(Level.INFO, "Creating {0}", resultDir);
106-
Files.createDirectories(Paths.get(resultDir));
107-
}
108-
if (Files.notExists(Paths.get(userProjectsDir))) {
109-
logger.log(Level.INFO, "Creating {0}", userProjectsDir);
110-
Files.createDirectories(Paths.get(userProjectsDir));
111-
}
100+
Files.createDirectories(Paths.get(resultRoot));
101+
Files.createDirectories(Paths.get(resultDir));
102+
Files.createDirectories(Paths.get(userProjectsDir));
112103

113104
// create file handler
114105
FileHandler fh = new FileHandler(resultDir + "/java_test_suite.out", true);
@@ -121,19 +112,35 @@ public static void initialize(String appPropsFile) throws Exception {
121112
// for manual/local run, create file handler, create PVROOT
122113
if (System.getenv("WERCKER") == null && System.getenv("JENKINS") == null) {
123114
logger.log(Level.INFO, "Creating PVROOT {0}", pvRoot);
124-
if (Files.notExists(Paths.get(pvRoot))) {
125-
logger.log(Level.INFO, "Creating {0}", pvRoot);
126-
Files.createDirectories(Paths.get(pvRoot));
127-
} else {
128-
logger.log(Level.INFO, "{0} already exists, skipping...", pvRoot);
129-
}
115+
Files.createDirectories(Paths.get(pvRoot));
130116
ExecResult result = ExecCommand.exec("chmod 777 " + pvRoot);
131117
if (result.exitValue() != 0) {
132118
throw new RuntimeException(
133119
"FAILURE: Couldn't change permissions for PVROOT " + result.stderr());
134120
}
135121
}
136122

123+
if (System.getenv("JENKINS") != null) {
124+
logger.info("Creating " + resultRoot + "/acceptance_test_tmp");
125+
TestUtils.exec(
126+
"/usr/local/packages/aime/ias/run_as_root \"mkdir -p "
127+
+ resultRoot
128+
+ "/acceptance_test_tmp\"");
129+
TestUtils.exec(
130+
"/usr/local/packages/aime/ias/run_as_root \"chmod 777 "
131+
+ resultRoot
132+
+ "/acceptance_test_tmp\"");
133+
logger.info("Creating " + pvRoot + "/acceptance_test_pv");
134+
TestUtils.exec(
135+
"/usr/local/packages/aime/ias/run_as_root \"mkdir -p "
136+
+ pvRoot
137+
+ "/acceptance_test_pv\"");
138+
TestUtils.exec(
139+
"/usr/local/packages/aime/ias/run_as_root \"chmod 777 "
140+
+ pvRoot
141+
+ "/acceptance_test_pv\"");
142+
}
143+
137144
logger.info("appProps = " + appProps);
138145
logger.info("maxIterationPod = " + appProps.getProperty("maxIterationsPod"));
139146
logger.info(
@@ -220,7 +227,6 @@ public void testAdminT3Channel(Domain domain) throws Exception {
220227
* at weblogic.cluster.UnicastSender.send(UnicastSender.java:21)
221228
* Truncated. see log file for complete stacktrace
222229
*/
223-
224230
if (domainMap.containsKey("domainHomeImageBase")) {
225231
if (domainMap.get("initialManagedServerReplicas") != null
226232
&& ((Integer) domainMap.get("initialManagedServerReplicas")).intValue() >= 1) {
@@ -536,4 +542,29 @@ private void callWebAppAndVerifyScaling(Domain domain, int replicas) throws Exce
536542
TestUtils.checkServiceCreated(podName, domainNS);
537543
}
538544
}
545+
546+
public static void tearDown() throws Exception {
547+
StringBuffer cmd =
548+
new StringBuffer("export RESULT_ROOT=$RESULT_ROOT && export PV_ROOT=$PV_ROOT && ");
549+
cmd.append(BaseTest.getProjectRoot())
550+
.append("/integration-tests/src/test/resources/statedump.sh");
551+
logger.info("Running " + cmd);
552+
553+
ExecResult result = ExecCommand.exec(cmd.toString());
554+
if (result.exitValue() == 0) {
555+
logger.info("Executed statedump.sh " + result.stdout());
556+
} else {
557+
logger.info("Execution of statedump.sh failed, " + result.stderr() + "\n" + result.stdout());
558+
}
559+
560+
// if (JENKINS) {
561+
result = cleanup();
562+
logger.info("cleanup result =" + result.stdout() + "\n " + result.stderr());
563+
// }
564+
565+
if (getLeaseId() != "") {
566+
logger.info("Release the k8s cluster lease");
567+
TestUtils.releaseLease(getProjectRoot(), getLeaseId());
568+
}
569+
}
539570
}

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

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
import java.util.Map;
88
import oracle.kubernetes.operator.utils.Domain;
9-
import oracle.kubernetes.operator.utils.ExecCommand;
10-
import oracle.kubernetes.operator.utils.ExecResult;
119
import oracle.kubernetes.operator.utils.Operator;
1210
import oracle.kubernetes.operator.utils.Operator.RESTCertType;
1311
import oracle.kubernetes.operator.utils.TestUtils;
@@ -93,25 +91,7 @@ public static void staticUnPrepare() throws Exception {
9391
logger.info("BEGIN");
9492
logger.info("Run once, release cluster lease");
9593

96-
StringBuffer cmd =
97-
new StringBuffer("export RESULT_ROOT=$RESULT_ROOT && export PV_ROOT=$PV_ROOT && ");
98-
cmd.append(BaseTest.getProjectRoot())
99-
.append("/integration-tests/src/test/resources/statedump.sh");
100-
logger.info("Running " + cmd);
101-
102-
ExecResult result = ExecCommand.exec(cmd.toString());
103-
if (result.exitValue() == 0) logger.info("Executed statedump.sh " + result.stdout());
104-
else
105-
logger.info("Execution of statedump.sh failed, " + result.stderr() + "\n" + result.stdout());
106-
107-
if (JENKINS) {
108-
cleanup();
109-
}
110-
111-
if (getLeaseId() != "") {
112-
logger.info("Release the k8s cluster lease");
113-
TestUtils.releaseLease(getProjectRoot(), getLeaseId());
114-
}
94+
tearDown();
11595

11696
logger.info("SUCCESS");
11797
}
@@ -129,7 +109,7 @@ public static void staticUnPrepare() throws Exception {
129109
*
130110
* @throws Exception
131111
*/
132-
@Test
112+
// @Test
133113
public void testDomainOnPVUsingWLST() throws Exception {
134114
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
135115
logTestBegin(testMethodName);
@@ -167,7 +147,7 @@ public void testDomainOnPVUsingWLST() throws Exception {
167147
*
168148
* @throws Exception
169149
*/
170-
@Test
150+
// @Test
171151
public void testDomainOnPVUsingWDT() throws Exception {
172152
Assume.assumeFalse(QUICKTEST);
173153
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -211,7 +191,7 @@ public void testDomainOnPVUsingWDT() throws Exception {
211191
*
212192
* @throws Exception
213193
*/
214-
@Test
194+
// @Test
215195
public void testTwoDomainsManagedByTwoOperators() throws Exception {
216196
Assume.assumeFalse(QUICKTEST);
217197
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -292,7 +272,7 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
292272
*
293273
* @throws Exception
294274
*/
295-
@Test
275+
// @Test
296276
public void testCreateDomainWithStartPolicyAdminOnly() throws Exception {
297277
Assume.assumeFalse(QUICKTEST);
298278
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -325,7 +305,7 @@ public void testCreateDomainWithStartPolicyAdminOnly() throws Exception {
325305
*
326306
* @throws Exception
327307
*/
328-
@Test
308+
// @Test
329309
public void testCreateDomainPVReclaimPolicyRecycle() throws Exception {
330310
Assume.assumeFalse(QUICKTEST);
331311
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -358,7 +338,7 @@ public void testCreateDomainPVReclaimPolicyRecycle() throws Exception {
358338
*
359339
* @throws Exception
360340
*/
361-
@Test
341+
// @Test
362342
public void testCreateDomainWithDefaultValuesInSampleInputs() throws Exception {
363343
Assume.assumeFalse(QUICKTEST);
364344
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -449,7 +429,7 @@ public void testAutoAndCustomSitConfigOverrides() throws Exception {
449429
*
450430
* @throws Exception
451431
*/
452-
@Test
432+
// @Test
453433
public void testOperatorRESTIdentityBackwardCompatibility() throws Exception {
454434
Assume.assumeFalse(QUICKTEST);
455435
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -471,7 +451,7 @@ public void testOperatorRESTIdentityBackwardCompatibility() throws Exception {
471451
*
472452
* @throws Exception
473453
*/
474-
@Test
454+
// @Test
475455
public void testOperatorRESTUsingCertificateChain() throws Exception {
476456
Assume.assumeFalse(QUICKTEST);
477457

@@ -491,7 +471,7 @@ public void testOperatorRESTUsingCertificateChain() throws Exception {
491471
*
492472
* @throws Exception
493473
*/
494-
@Test
474+
// @Test
495475
public void testDomainInImageUsingWLST() throws Exception {
496476
Assume.assumeFalse(QUICKTEST);
497477
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -523,7 +503,7 @@ public void testDomainInImageUsingWLST() throws Exception {
523503
*
524504
* @throws Exception
525505
*/
526-
@Test
506+
// @Test
527507
public void testDomainInImageUsingWDT() throws Exception {
528508
Assume.assumeFalse(QUICKTEST);
529509
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();

‎integration-tests/src/test/java/oracle/kubernetes/operator/ITSitConfig.java

Lines changed: 39 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -80,26 +80,30 @@ public class ITSitConfig extends BaseTest {
8080
@BeforeClass
8181
public static void staticPrepare() throws Exception {
8282
// initialize test properties and create the directories
83-
initialize(APPPROPSFILE);
84-
Assume.assumeFalse(QUICKTEST);
85-
if (operator1 == null) {
86-
operator1 = TestUtils.createOperator(OPERATOR1FILE);
83+
84+
if (!QUICKTEST) {
85+
// initialize test properties and create the directories
86+
initialize(APPPROPSFILE);
87+
88+
if (operator1 == null) {
89+
operator1 = TestUtils.createOperator(OPERATOR1FILE);
90+
}
91+
TESTSCRIPTDIR = BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/";
92+
domain = createSitConfigDomain();
93+
Assert.assertNotNull(domain);
94+
ADMINPODNAME = domain.getDomainUid() + "-" + domain.getAdminServerName();
95+
TestUtils.copyFileViaCat(
96+
TESTSCRIPTDIR + "sitconfig/java/SitConfigTests.java",
97+
"SitConfigTests.java",
98+
ADMINPODNAME,
99+
domain.getDomainNS());
100+
TestUtils.copyFileViaCat(
101+
TESTSCRIPTDIR + "sitconfig/scripts/runSitConfigTests.sh",
102+
"runSitConfigTests.sh",
103+
ADMINPODNAME,
104+
domain.getDomainNS());
105+
fqdn = TestUtils.getHostName();
87106
}
88-
TESTSCRIPTDIR = BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/";
89-
domain = createSitConfigDomain();
90-
Assert.assertNotNull(domain);
91-
ADMINPODNAME = domain.getDomainUid() + "-" + domain.getAdminServerName();
92-
TestUtils.copyFileViaCat(
93-
TESTSCRIPTDIR + "sitconfig/java/SitConfigTests.java",
94-
"SitConfigTests.java",
95-
ADMINPODNAME,
96-
domain.getDomainNS());
97-
TestUtils.copyFileViaCat(
98-
TESTSCRIPTDIR + "sitconfig/scripts/runSitConfigTests.sh",
99-
"runSitConfigTests.sh",
100-
ADMINPODNAME,
101-
domain.getDomainNS());
102-
fqdn = TestUtils.getHostName();
103107
}
104108

105109
/**
@@ -109,32 +113,19 @@ public static void staticPrepare() throws Exception {
109113
*/
110114
@AfterClass
111115
public static void staticUnPrepare() throws Exception {
112-
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
113-
logger.info("BEGIN");
114-
logger.info("Run once, release cluster lease");
115-
StringBuffer cmd =
116-
new StringBuffer("export RESULT_ROOT=$RESULT_ROOT && export PV_ROOT=$PV_ROOT && ");
117-
cmd.append(BaseTest.getProjectRoot())
118-
.append("/integration-tests/src/test/resources/statedump.sh");
119-
logger.log(Level.INFO, "Running {0}", cmd);
120-
ExecResult result = ExecCommand.exec(cmd.toString());
121-
if (result.exitValue() == 0) {
122-
logger.log(Level.INFO, "Executed statedump.sh {0}", result.stdout());
123-
} else {
124-
logger.log(
125-
Level.INFO,
126-
"Execution of statedump.sh failed, {0}\n{1}",
127-
new Object[] {result.stderr(), result.stdout()});
128-
}
129-
destroySitConfigDomain();
130-
if (JENKINS) {
131-
cleanup();
132-
}
133-
if (!"".equals(getLeaseId())) {
134-
logger.info("Release the k8s cluster lease");
135-
TestUtils.releaseLease(getProjectRoot(), getLeaseId());
116+
if (!QUICKTEST) {
117+
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
118+
logger.info("BEGIN");
119+
logger.info("Run once, release cluster lease");
120+
121+
destroySitConfigDomain();
122+
tearDown();
123+
if (!"".equals(getLeaseId())) {
124+
logger.info("Release the k8s cluster lease");
125+
TestUtils.releaseLease(getProjectRoot(), getLeaseId());
126+
}
127+
logger.info("SUCCESS");
136128
}
137-
logger.info("SUCCESS");
138129
}
139130

140131
/**
@@ -147,6 +138,7 @@ public static void staticUnPrepare() throws Exception {
147138
*/
148139
@Test
149140
public void testCustomSitConfigOverridesForDomain() throws Exception {
141+
Assume.assumeFalse(QUICKTEST);
150142
boolean testCompletedSuccessfully = false;
151143
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
152144
logTestBegin(testMethod);
@@ -172,6 +164,7 @@ public void testCustomSitConfigOverridesForDomain() throws Exception {
172164
*/
173165
@Test
174166
public void testCustomSitConfigOverridesForJdbc() throws Exception {
167+
Assume.assumeFalse(QUICKTEST);
175168
boolean testCompletedSuccessfully = false;
176169
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
177170
logTestBegin(testMethod);
@@ -195,6 +188,7 @@ public void testCustomSitConfigOverridesForJdbc() throws Exception {
195188
*/
196189
@Test
197190
public void testCustomSitConfigOverridesForJms() throws Exception {
191+
Assume.assumeFalse(QUICKTEST);
198192
boolean testCompletedSuccessfully = false;
199193
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
200194
logTestBegin(testMethod);
@@ -217,6 +211,7 @@ public void testCustomSitConfigOverridesForJms() throws Exception {
217211
*/
218212
@Test
219213
public void testCustomSitConfigOverridesForWldf() throws Exception {
214+
Assume.assumeFalse(QUICKTEST);
220215
boolean testCompletedSuccessfully = false;
221216
String testMethod = new Object() {}.getClass().getEnclosingMethod().getName();
222217
logTestBegin(testMethod);

0 commit comments

Comments
 (0)