NoBug: Clean up of embedded tests (#22166)

* Modified run_test.sh to remove redundant things * Renaming test-id to embedded_all
javaee · Aug 14, 2017 · 909a023 · 909a023
1 parent b1c1b20
commit 909a023
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/appserver/tests/embedded/maven-plugin/init/pom.xml b/appserver/tests/embedded/maven-plugin/init/pom.xml
@@ -52,7 +52,7 @@
     <groupId>org.glassfish.tests.embedded.maven-plugin</groupId>
     <artifactId>init</artifactId>
     <packaging>pom</packaging>
-    <name>Bootstrap all tests to use 4.1-SNAPSHOT of glassfish-embedded-all</name>
+    <name>Bootstrap all tests to use ${project.version} of glassfish-embedded-all</name>
 
     <build>
         <plugins>

diff --git a/...rver/tests/embedded_publisher/run_test.sh → appserver/tests/embedded/run_test.sh b/...rver/tests/embedded_publisher/run_test.sh → appserver/tests/embedded/run_test.sh
@@ -39,13 +39,10 @@
 # holder.
 #
 
-test_run_embedded_publisher(){
-	M2_HOME=/net/gf-hudson/scratch/gf-hudson/export2/hudson/tools/apache-maven-3.0.3
+test_run_embedded(){
 	MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=384m"; export MAVEN_OPTS
 	MAVEN_REPO=$WORKSPACE/repository
-	MAVEN_SETTINGS=$M2_HOME/settings-nexus.xml
-	PATH=$M2_HOME/bin:$JAVA_HOME/bin:$PATH; export PATH
-	mvn -version
+	PATH=$JAVA_HOME/bin:$PATH; export PATH
 	echo $WORKSPACE
   cd $WORKSPACE/main
   mvn -Dmaven.repo.local=$WORKSPACE/repository -DskipTests=true clean install
@@ -61,12 +58,12 @@ test_run_embedded_publisher(){
   cd $WORKSPACE/main/appserver/tests/embedded/maven-plugin/mdb
   mvn -Dmaven.repo.local=$WORKSPACE/repository -DskipTests=true clean verify
   cd $WORKSPACE/main/appserver/tests/embedded
-  mvn -Dmaven.repo.local=$WORKSPACE/repository -DskipTests=true clean verify
+  mvn -Dbuild=snapshot  -Dmaven.repo.local=$WORKSPACE/repository -Dmaven.test.failure.ignore=true clean verify
   merge_junits
 }
 
 merge_junits(){
-  TEST_ID="embedded_publisher_all"
+  TEST_ID="embedded_all"
   rm -rf ${WORKSPACE}/results || true
   mkdir -p ${WORKSPACE}/results/junitreports
   JUD="${WORKSPACE}/results/junitreports/test_results_junit.xml"
@@ -89,8 +86,8 @@ run_test_id(){
 	rm -rf main || true
 	unzip_test_resources "$WORKSPACE/bundles/main.zip -d main/"
   case ${TEST_ID} in
-    embedded_publisher_all)
-   	  test_run_embedded_publisher;;
+    embedded_all)
+   	  test_run_embedded;;
   esac
   upload_test_results
   delete_bundle
@@ -99,7 +96,7 @@ run_test_id(){
 
 
 list_test_ids(){
-	echo embedded_publisher_all
+	echo embedded_all
 }
 
 OPT=$1

diff --git a/appserver/tests/test_groups/gating b/appserver/tests/test_groups/gating
@@ -18,7 +18,7 @@ cts_smoke_all
 servlet_tck_all
 findbugs_all
 findbugs_low_priority_all
-embedded_publisher_all
+embedded_all
 copyright
 jdbc_all
 jms_all