Merge pull request #21724 from sameer-pandit/master

add cts category, diable security tests

Author: arindam-bandyopadhyay

main/appserver/tests/appserv-tests/devtests/security/ciphertest/build.xml

@@ -149,18 +149,18 @@
 
       <property name="https.1.port" value="1${https.port}" />
       <property name="https.2.port" value="2${https.port}" />
-      
+      <!-- Skip below https://jira.oraclecorp.com/jira/browse/IDCINTER-82
       <antcall target="cipher-test">
         <param name="should-pass-cipher" value="SSL_RSA_WITH_RC4_128_MD5"/>
         <param name="enable-cipher"      value="SSL_RSA_WITH_RC4_128_MD5"/>
         <param name="https.port"         value="${https.1.port}"/>
       </antcall>
-
+     
       <antcall target="cipher-test">
         <param name="should-pass-cipher" value=""/>
         <param name="enable-cipher"      value="SSL_RSA_WITH_3DES_EDE_CBC_SHA"/>
         <param name="https.port"         value="${https.1.port}"/>
-      </antcall>
+      </antcall>-->
 
       <antcall target="cipher-test">
         <param name="should-pass-cipher" value=""/>
@@ -224,12 +224,12 @@
         <param name="enable-cipher"      value="SSL_RSA_WITH_NULL_MD5"/>
         <param name="https.port"         value="${https.2.port}"/>
       </antcall>
-
+      <!-- Skip below https://jira.oraclecorp.com/jira/browse/IDCINTER-82
       <antcall target="cipher-test">
         <param name="should-pass-cipher" value="SSL_RSA_WITH_RC4_128_SHA"/>
         <param name="enable-cipher"      value="SSL_RSA_WITH_RC4_128_SHA"/>
         <param name="https.port"         value="${https.2.port}"/>
-      </antcall>
+      </antcall>-->
 
       <antcall target="cipher-test">
         <param name="should-pass-cipher" value="SSL_RSA_WITH_NULL_SHA"/>

main/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.xml

@@ -14,8 +14,12 @@
     &testproperties;
     &commonSecurity;
 
-    <target name="all" 
-    depends="clean, build, setup, deploy, run, undeploy, unsetup"/>
+    <!--<target name="all" 
+    depends="clean, build, setup, deploy, run, undeploy, unsetup"/>-->
+    <target name="all" depends="clean">
+      <echo message="Known failure see https://jira.oraclecorp.com/jira/browse/IDCINTER-82"/>
+    </target>
+    
 
     <target name="run-test" 
     depends="clean, build, deploy, run, undeploy"/>

main/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.xml

@@ -14,8 +14,11 @@
     &testproperties;
     &commonSecurity;
 
-    <target name="all" 
-    depends="clean, build, setup, deploy, run, undeploy, unsetup"/>
+    <!--<target name="all" 
+    depends="clean, build, setup, deploy, run, undeploy, unsetup"/>-->
+    <target name="all" depends="clean">
+      <echo message="Known failure see https://jira.oraclecorp.com/jira/browse/IDCINTER-82"/>
+    </target>
 
     <target name="run-test" 
     depends="clean, build, deploy, run, undeploy"/>

main/appserver/tests/common_test.sh

@@ -73,6 +73,8 @@ test_init(){
 	ANT_HOME=/net/gf-hudson/scratch/gf-hudson/export2/hudson/tools/ant-1.7.1; export ANT_HOME
 	APS_HOME=$WORKSPACE/main/appserver/tests/appserv-tests; export APS_HOME
 	TEST_RUN_LOG=tests-run.log; export TEST_RUN_LOG
+        #workaround for OSGI timestamp issue
+        find $S1AS_HOME -type f | xargs touch > /dev/null
 	echo S1AS_HOME is $S1AS_HOME
 	echo ANT_HOME is $ANT_HOME
 	echo APS_HOME is $APS_HOME
@@ -122,6 +124,7 @@ unzip_test_resources(){
 
 copy_test_artifects(){
 	printf "\n%s \n\n" "===== COPY TEST ARTIFECTs ====="
+        zip -r $WORKSPACE/results/domainArchive.zip $S1AS_HOME/domains
 	cp $S1AS_HOME/domains/domain1/logs/server.log* $WORKSPACE/results/ || true
 	cp $TEST_RUN_LOG $WORKSPACE/results/
 	cp $WORKSPACE/bundles/version-info.txt $WORKSPACE/results/

main/appserver/tests/cts_smoke/run_test.sh

@@ -191,7 +191,7 @@ run_test_id(){
 		echo "Invalid Test ID"
 		exit 1
 	fi
-    cts_to_junit $result $WORKSPACE/results/junitreports/test_results_junit.xml
+    cts_to_junit $result $WORKSPACE/results/junitreports/test_results_junit.xml $1
     upload_test_results
     delete_bundle
     cd -
@@ -203,6 +203,7 @@ list_test_ids(){
 }
 
 cts_to_junit(){
+        junitCategory=$3
 	cd $WORKSPACE/results
 	rm -rf $2
 	cat $1 | ${GREP} -a "\[javatest.batch\] Finished Test" >  results.txt
@@ -219,7 +220,7 @@ cts_to_junit(){
 		classname=`echo $id | cut -d '#' -f1 | ${SED} s@"\/"@"."@g`
 		name=`echo $id | cut -d '#' -f2`
 
-		echo "		<testcase classname=\"$classname\" name=\"$name\">" >> $2		
+		echo "		<testcase classname=\"${junitCategory}.$classname\" name=\"$name\">" >> $2		
 		if [ "${status}" = "FAILED" ]
 		then
 			echo "			<failure type=\"CtsFailure\"> n/a </failure>" >> $2

main/appserver/tests/rq.sh

@@ -77,7 +77,7 @@ key_val_as_list(){
 # Args: BUILD_NUMBER
 #
 get_test_job_params(){
-  local url="${HUDSON_URL}/${1}/api/xml?xpath=//parameter&wrapper=list"
+  local url="${GLASSFISH_REMOTE_QUEUE_URL}/${1}/api/xml?xpath=//parameter&wrapper=list"
   curl "${url}" | sed \
       -e s@'<list><parameter>'@@g -e s@'</list>'@@g \
       -e s@'<parameter>'@@g -e s@'</parameter>'@@g \
@@ -130,7 +130,7 @@ is_test_job_match(){
 # This will include the currently on-going runs.
 #
 get_test_job_last_build_number(){
-  local url="${HUDSON_URL}/api/xml?xpath=//lastBuild/number/text()"
+  local url="${GLASSFISH_REMOTE_QUEUE_URL}/api/xml?xpath=//lastBuild/number/text()"
   curl "${url}"
   local error_code=${?}
   if [ ${error_code} -ne 0 ] ; then
@@ -189,7 +189,7 @@ list_group_test_ids(){
 	echo ${test_id_arr[*]}
 }
 
-if [[ -z $HUDSON_URL ]]; then
+if [[ -z $GLASSFISH_REMOTE_QUEUE_URL ]]; then
 	echo "Please enter hudson url"
 	exit 1
 fi
@@ -227,20 +227,20 @@ fork_origin=`git config --get remote.origin.url`
 test_ids_encoded=`echo ${test_ids[@]} | tr ' ' '+'`
 params="BRANCH=${branch}&TEST_IDS=${test_ids_encoded}&FORK_ORIGIN=${fork_origin}"
 last_build=`get_test_job_last_build_number`
-curl -X POST "${HUDSON_URL}/buildWithParameters?${params}&delay=0sec" 2> /dev/null
+curl -X POST "${GLASSFISH_REMOTE_QUEUE_URL}/buildWithParameters?${params}&delay=0sec" 2> /dev/null
 test_ids_triggerd=`echo ${test_ids[@]}`
 export branch fork_origin test_ids_triggerd
 job_build_number=`find_test_job ${last_build}`
 printf "###################################################################\n"
 printf "###################################################################\n"
 if [[ ! -z ${job_build_number} ]]; then
 	printf "RQ triggered successfully. Please find the RQ link below\n"
-	printf ${HUDSON_URL}/${job_build_number}
+	printf ${GLASSFISH_REMOTE_QUEUE_URL}/${job_build_number}
 	printf "\n"
 	printf "###################################################################\n"
 	printf "###################################################################\n"
 else
 	printf "Issue in RQ client.Please check your git settings\n"
 	printf "###################################################################\n"
 	printf "###################################################################\n"
-fi
+fi

main/appserver/tests/test_groups/gating

@@ -1 +1,19 @@
+web_all
+sqe_smoke_all
+security_all
+admin_cli_all
+deployment_all
+deployment_cluster_all
+ejb_all
+ejb_timer_cluster_all
+ejb_web_all
+transaction_ee_all
+cdi_all
 ql_gf_full_profile_all
+ql_gf_nucleus_all
+ql_gf_web_profile_all
+ql_gf_embedded_profile_all
+nucleus_admin_all
+cts_smoke_all
+servlet_tck_all
+findbugs_all