Fix QL test (omit OSGi) enable QL tests and add back web_jsp
Added some comments and white space to the run_test script.
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
diff --git a/Jenkinsfile b/Jenkinsfile
index 98cc627..883d289 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,20 +21,20 @@
// list of test ids
def jobs = [
- "cdi_all"
+ "cdi_all",
+ "ql_gf_full_profile_all",
+ "ql_gf_web_profile_all"
]
def jobs_all = [
+ "web_jsp",
"deployment_all",
"ejb_group_1",
"ejb_group_2",
"ejb_group_3",
"ejb_web_all",
- "cdi_all",
- "ql_gf_full_profile_all",
"ql_gf_nucleus_all",
- "ql_gf_web_profile_all",
"nucleus_admin_all",
"jdbc_all",
"batch_all",
diff --git a/appserver/tests/quicklook/run_test.sh b/appserver/tests/quicklook/run_test.sh
index 3ce2f38..5f8ca53 100755
--- a/appserver/tests/quicklook/run_test.sh
+++ b/appserver/tests/quicklook/run_test.sh
@@ -17,7 +17,7 @@
copy_ql_results(){
if [[ ${1} = "ql_gf_web_profile_all" || ${1} = "ql_gf_full_profile_all" || "ql_gf_embedded_profile_all" = ${1} ]]; then
- tar -cvf ${WORKSPACE}/results/domainArchive.tar.gz ${WORKSPACE}/glassfish6/glassfish/domains
+ tar -cf ${WORKSPACE}/results/domainArchive.tar.gz ${WORKSPACE}/glassfish6/glassfish/domains
cp ${WORKSPACE}/glassfish6/glassfish/domains/domain1/logs/server.log* ${WORKSPACE}/results/ || true
cp -r ${WORKSPACE}/appserver/tests/quicklook/test-output/* ${WORKSPACE}/results/
cp ${WORKSPACE}/appserver/tests/quicklook/test-output/TESTS-TestSuites.xml ${WORKSPACE}/results/junitreports/test_results_junit.xml
@@ -26,38 +26,54 @@
cp ${WORKSPACE}/nucleus/domains/domain1/logs/server.log* ${WORKSPACE}/results
fi
cp ${TEST_RUN_LOG} ${WORKSPACE}/results/
- tar -cvf ${WORKSPACE}/${1}-results.tar.gz ${WORKSPACE}/results
+ tar -cf ${WORKSPACE}/${1}-results.tar.gz ${WORKSPACE}/results
change_junit_report_class_names
}
run_test_id(){
if [[ ${1} = "ql_gf_full_profile_all" ]]; then
+
+ # Run quick look full profile tests using the full glassfish distribution (GD) build
+
unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip
+
cd ${WORKSPACE}/appserver/tests/quicklook/
+
mvn -Dglassfish.home=${S1AS_HOME} -Ptest_gd_security,report test | tee ${TEST_RUN_LOG}
elif [[ ${1} = "ql_gf_nucleus_all" || ${1} = "nucleus_admin_all" ]]; then
+
+ # Run quick look nucleus tests using the nucleus build
+
unzip_test_resources ${WORKSPACE}/bundles/nucleus-new.zip
+
if [[ ${1} = "ql_gf_nucleus_all" ]]; then
cd ${WORKSPACE}/nucleus/tests/quicklook
elif [[ ${1} = "nucleus_admin_all" ]]; then
cd ${WORKSPACE}/nucleus/tests/admin
fi
+
mvn -Dmaven.test.failure.ignore=true -Dnucleus.home=${WORKSPACE}/nucleus clean test | tee ${TEST_RUN_LOG}
+
if [[ ${1} = "ql_gf_nucleus_all" ]]; then
merge_junit_xmls ${WORKSPACE}/nucleus/tests/quicklook/target/surefire-reports/junitreports
elif [[ ${1} = "nucleus_admin_all" ]]; then
merge_junit_xmls ${WORKSPACE}/nucleus/tests/admin/target/surefire-reports/junitreports
fi
elif [[ ${1} = "ql_gf_web_profile_all" || $1 = "ql_gf_embedded_profile_all" ]]; then
- unzip_test_resources ${WORKSPACE}/bundles/web.zip
+
+ # Run quick look EE web profile tests using the web profile glassfish distribution (WD, Web Distribution) build
+
+ unzip_test_resources ${WORKSPACE}/bundles/web.zip
+
cd ${WORKSPACE}/appserver/tests/quicklook/
+
if [[ ${1} = "ql_gf_web_profile_all" ]]; then
mvn -Dglassfish.home=${S1AS_HOME} -Ptest_wd_security,report test | tee ${TEST_RUN_LOG}
elif [[ ${1} = "ql_gf_embedded_profile_all" ]]; then
mvn -Dglassfish.home=${S1AS_HOME} -Ptest_em,report test | tee ${TEST_RUN_LOG}
fi
else
- echo "Invalid Test Id"
+ echo "Invalid Test Id!"
exit 1
fi
}
diff --git a/appserver/tests/quicklook/testng/testng_wd.xml b/appserver/tests/quicklook/testng/testng_wd.xml
index ae43513..3412cf0 100644
--- a/appserver/tests/quicklook/testng/testng_wd.xml
+++ b/appserver/tests/quicklook/testng/testng_wd.xml
@@ -18,6 +18,11 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<!--
+
+ Tests for "WD" (Web Distribution, aka Jakarta EE Web Profile)
+
+ -->
<suite name="QuickLookTests" verbose="2">
<parameter name="admin.url" value="http://localhost:4848/__asadmin" />
@@ -140,10 +145,12 @@
</classes>
</test>
+<!-- Uncomment when/if fighterfish is reenabled
<test name="osgi_test">
<classes>
<class name="test.osgi.hello.HelloOSGITestNG" />
</classes>
</test>
+-->
</suite>
diff --git a/gftest.sh b/gftest.sh
index 66fef1a..0681a38 100755
--- a/gftest.sh
+++ b/gftest.sh
@@ -28,6 +28,7 @@
if [ "$#" -eq 0 ]; then
declare -a arr=(
+ "web_jsp"
"deployment_all"
"ejb_group_1"
"ejb_group_2"
