Testing CI pipeline.
Signed-off-by: RohitKumarJain <rohit.ku.jain@oracle.com>
diff --git a/appserver/tests/appserv-tests/config/common.xml b/appserver/tests/appserv-tests/config/common.xml
index b90b445..2b67366 100644
--- a/appserver/tests/appserv-tests/config/common.xml
+++ b/appserver/tests/appserv-tests/config/common.xml
@@ -1826,6 +1826,7 @@
<echo message="stopping server on unix ..."/>
<exec executable="${env.S1AS_HOME}/bin/asadmin">
<arg value="stop-domain"/>
+ <arg value="--kill=true"/>
</exec>
<sleep seconds="10"/>
</target>
diff --git a/appserver/tests/appserv-tests/config/run.xml b/appserver/tests/appserv-tests/config/run.xml
index 58dd78a..1fea2f8 100644
--- a/appserver/tests/appserv-tests/config/run.xml
+++ b/appserver/tests/appserv-tests/config/run.xml
@@ -117,6 +117,7 @@
<echo message="run.xml:stopping domain..."/>
<exec executable="${ASADMIN}" failonerror="true">
<arg line="stop-domain"/>
+ <arg value="--kill=true"/>
</exec>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/batch/run_test.sh b/appserver/tests/appserv-tests/devtests/batch/run_test.sh
index 825f417..21e4264 100755
--- a/appserver/tests/appserv-tests/devtests/batch/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/batch/run_test.sh
@@ -36,7 +36,7 @@
echo "ANT_OPTS=${ANT_OPTS}"
ant ${TARGET} | tee ${TEST_RUN_LOG}
${S1AS_HOME}/bin/asadmin stop-database
- ${S1AS_HOME}/bin/asadmin stop-domain
+ ${S1AS_HOME}/bin/asadmin stop-domain --kill=true
}
run_test_id(){
diff --git a/appserver/tests/appserv-tests/devtests/deployment/config/common.xml b/appserver/tests/appserv-tests/devtests/deployment/config/common.xml
index e691480..5c75f5e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/config/common.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/config/common.xml
@@ -862,6 +862,7 @@
</antcall>
<exec executable="${ASADMIN}" failonerror="true">
<arg line="stop-domain"/>
+ <arg value="--kill=true"/>
</exec>
<antcall target="postTestsRun"/>
<record name="client.log" action="stop"/>
@@ -1041,6 +1042,7 @@
<echo message="Restarting server..."/>
<exec executable="${ASADMIN}" failonerror="true">
<arg line="stop-domain"/>
+ <arg value="--kill=true"/>
</exec>
<antcall target="start-process">
<param name="line" value="start-domain --user ${admin.user} --passwordfile ${passwordFile}"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/run_test.sh b/appserver/tests/appserv-tests/devtests/deployment/run_test.sh
index c763790..81fd9a8 100755
--- a/appserver/tests/appserv-tests/devtests/deployment/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/deployment/run_test.sh
@@ -51,7 +51,7 @@
if [ -z "${DEPL_TARGET}" ]
then
- ${S1AS_HOME}/bin/asadmin stop-domain
+ ${S1AS_HOME}/bin/asadmin stop-domain --kill=true
fi
if [[ ${1} = "deployment_cluster_all" ]]; then
cp -r ${APS_HOME}/devtests/deployment/server-logs/ ${WORKSPACE}/results/
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/run_test.sh b/appserver/tests/appserv-tests/devtests/jdbc/run_test.sh
index c7a3fa0..1846cc6 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/jdbc/run_test.sh
@@ -24,7 +24,7 @@
${S1AS_HOME}/bin/asadmin start-database
cd ${APS_HOME}/devtests/jdbc
ant ${TARGET} | tee ${TEST_RUN_LOG}
- ${S1AS_HOME}/bin/asadmin stop-domain domain1
+ ${S1AS_HOME}/bin/asadmin stop-domain --kill=true
${S1AS_HOME}/bin/asadmin stop-database
}
diff --git a/appserver/tests/appserv-tests/devtests/persistence/run_test.sh b/appserver/tests/appserv-tests/devtests/persistence/run_test.sh
index e5c82f9..9d82558 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/persistence/run_test.sh
@@ -25,7 +25,7 @@
cd ${APS_HOME}/devtests/persistence/tests/packaging
ant ${TARGET} | tee ${TEST_RUN_LOG}
${S1AS_HOME}/bin/asadmin stop-database
- ${S1AS_HOME}/bin/asadmin stop-domain
+ ${S1AS_HOME}/bin/asadmin stop-domain --kill=true
}
run_test_id(){
diff --git a/appserver/tests/quicklook/build.xml b/appserver/tests/quicklook/build.xml
index 2adb56a..39a9fec 100644
--- a/appserver/tests/quicklook/build.xml
+++ b/appserver/tests/quicklook/build.xml
@@ -694,6 +694,7 @@
<target name="stop-server-unix" if="isUnix">
<exec executable="${glassfish.home}/bin/asadmin">
<arg value="stop-domain"/>
+ <arg value="--kill=true"/>
</exec>
</target>
diff --git a/appserver/tests/quicklook/gfproject/v3-targets.xml b/appserver/tests/quicklook/gfproject/v3-targets.xml
index ee3942b..86e59b8 100644
--- a/appserver/tests/quicklook/gfproject/v3-targets.xml
+++ b/appserver/tests/quicklook/gfproject/v3-targets.xml
@@ -62,7 +62,7 @@
<target name="restart-server-unix" if="isUnix">
<exec executable="${glassfish.home}/bin/asadmin" outputproperty="message1">
<arg value="restart-domain"/>
- <arg value="domain1"/>
+ <arg value="--kill=true"/>
</exec>
<echo message="${message1}"/>
</target>
@@ -140,6 +140,7 @@
<echo message="stopping server on unix ..."/>
<exec executable="${glassfish.home}/bin/asadmin">
<arg value="stop-domain"/>
+ <arg value="--kill=true"/>
</exec>
</target>
diff --git a/nucleus/test-utils/utils-ng/src/main/java/org/glassfish/tests/utils/NucleusStartStopTest.java b/nucleus/test-utils/utils-ng/src/main/java/org/glassfish/tests/utils/NucleusStartStopTest.java
index 9db3fe7..01971de 100644
--- a/nucleus/test-utils/utils-ng/src/main/java/org/glassfish/tests/utils/NucleusStartStopTest.java
+++ b/nucleus/test-utils/utils-ng/src/main/java/org/glassfish/tests/utils/NucleusStartStopTest.java
@@ -30,7 +30,7 @@
@AfterSuite
public void tearDown() {
- assertTrue(nadmin("stop-domain"));
+ assertTrue(nadmin("stop-domain", "--kill=true"));
}
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/MiscCommandsTest.java b/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/MiscCommandsTest.java
index 5382259..83af660 100644
--- a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/MiscCommandsTest.java
+++ b/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/MiscCommandsTest.java
@@ -36,7 +36,7 @@
}
public void version2() {
- assertTrue(nadmin("stop-domain"));
+ assertTrue(nadmin("stop-domain", "--kill=true"));
assertTrue(nadmin("version", "--local"));
assertTrue(nadmin("start-domain"));
}
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/NucleusStartStopTest.java b/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/NucleusStartStopTest.java
index 872a289..ee3f5b0 100644
--- a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/NucleusStartStopTest.java
+++ b/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/NucleusStartStopTest.java
@@ -64,7 +64,7 @@
@AfterSuite(alwaysRun = true)
public void tearDown(ITestContext context) {
try {
- assertTrue(nadmin("stop-domain"));
+ assertTrue(nadmin("stop-domain", "--kill=true"));
} finally {
Collection<File> libs = (Collection<File>) context.getAttribute(TEST_LIBS_KEY);
if (libs != null) {
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java b/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java
index dc2ec81..26811f2 100644
--- a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java
+++ b/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java
@@ -44,7 +44,7 @@
@AfterTest
public void cleanUp() throws Exception {
- nadmin("stop-domain");
+ nadmin("stop-domain", "--kill=true");
JobManagerTest.deleteJobsFile();
//osgi-cache workaround
File osgiCacheDir = new File(nucleusRoot, "domains"+File.separator+"domain1"+File.separator+"osgi-cache");
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java b/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java
index ad378ff..db1a304 100644
--- a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java
+++ b/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java
@@ -39,7 +39,7 @@
@BeforeTest
public void setUp() throws Exception {
- nadmin("stop-domain");
+ nadmin("stop-domain", "--kill=true");
//delete jobs.xml incase there were other jobs run
deleteJobsFile();
//osgi-cache workaround
@@ -52,14 +52,14 @@
@AfterTest
public void cleanUp() throws Exception {
- nadmin("stop-domain");
+ nadmin("stop-domain", "--kill=true");
nadmin("start-domain");
}
@Test(enabled=true)
public void noJobsTest() {
- nadmin("stop-domain");
+ nadmin("stop-domain", "--kill=true");
//delete jobs.xml incase there were other jobs run
deleteJobsFile();
nadmin("start-domain");
@@ -83,7 +83,7 @@
result = nadminWithOutput("list-jobs","1").out;
assertTrue( result.contains(COMMAND1) && result.contains("COMPLETED"));
//shutdown server
- assertTrue( nadmin("stop-domain"));
+ assertTrue( nadmin("stop-domain", "--kill=true"));
//restart
assertTrue( nadmin("start-domain"));
//check jobs
@@ -97,7 +97,7 @@
public void runDetachTest() {
String result = null;
//shutdown server
- assertTrue( nadmin("stop-domain"));
+ assertTrue( nadmin("stop-domain", "--kill=true"));
//delete the jobs file
deleteJobsFile();
@@ -131,7 +131,7 @@
try {
String result = null;
//shutdown server
- assertTrue( nadmin("stop-domain"));
+ assertTrue( nadmin("stop-domain", "--kill=true"));
//delete the jobs file
deleteJobsFile();
@@ -148,7 +148,7 @@
result = nadminWithOutput("list-jobs","1").out;
assertTrue( result.contains(COMMAND1) );
//shutdown server
- assertTrue( nadmin("stop-domain"));
+ assertTrue( nadmin("stop-domain", "--kill=true"));
//start server
assertTrue( nadmin("start-domain"));
diff --git a/nucleus/tests/quicklook/src/test/java/org/glassfish/nucleus/quicklook/MiscCommandsTest.java b/nucleus/tests/quicklook/src/test/java/org/glassfish/nucleus/quicklook/MiscCommandsTest.java
index 5435088..41d82c0 100644
--- a/nucleus/tests/quicklook/src/test/java/org/glassfish/nucleus/quicklook/MiscCommandsTest.java
+++ b/nucleus/tests/quicklook/src/test/java/org/glassfish/nucleus/quicklook/MiscCommandsTest.java
@@ -36,7 +36,7 @@
}
public void version2() {
- assertTrue(nadmin("stop-domain"));
+ assertTrue(nadmin("stop-domain", "--kill=true"));
assertTrue(nadmin("version", "--local"));
assertTrue(nadmin("start-domain"));
}
