Bug 539464 - Run one configuration of IBuild tests on java 11

Removed Java10 tests

Change-Id: I44147e286bae8464ee0d85b10f7ab5f058d19202
Signed-off-by: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>

5 files changed, 4 insertions, 21 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
index b1760fde9..43c593d1f 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
@@ -248,7 +248,7 @@
     <!-- else normal unit tests configs -->
     <property
       name="testsConfigExpected"
-      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32_win32.win32.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java10_linux.gtk.x86_64_10,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11" />
+      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32_win32.win32.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11" />
 
     <echo message=" = = properties in publish.xml == " />
     <echo message="     job: ${job}" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
index 5053fa419..585ba0e7d 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish2.xml
@@ -271,7 +271,7 @@
     <!-- else normal unit tests configs -->
     <property
       name="testsConfigExpected"
-      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32_win32.win32.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java10_linux.gtk.x86_64_10,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11" />
+      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32_win32.win32.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3_linux.gtk.x86_64_8.0,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11" />
 
     <echo message=" = = properties in publish.xml == " />
     <echo message="     job: ${job}" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
index f00976977..54e18ce9d 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
@@ -11,7 +11,6 @@ include("buildproperties.php");
 
 $expectedTestConfigs = array();
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3_linux.gtk.x86_64_8.0";
-$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java10_linux.gtk.x86_64_10";
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-mac64_macosx.cocoa.x86_64_8.0";
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-win32_win32.win32.x86_64_8.0";
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java11_linux.gtk.x86_64_11";
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php
index abb809e0f..a510077e7 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/utilityFunctions.php
@@ -114,19 +114,9 @@ function calcTestConfigsRan($testResultsDirName) {
               $jobname=jobname($expectedTestConfigs[$i]);
               //echo "DEBUG: jobname: " . $jobname;
               if (substr_startswith($summFileName, $testResultsDirName."/".$jobname)) {
-                $summFileJava10=strpos($summFileName, "java10");
-                $jobnameJava10=strpos($testResultsDirName."/".$jobname, "java10");
-                if (($summFileJava10 > 0) && ($summFileJava10 == $jobnameJava10 )) {
-	              //echo "DEBUG: found matching summary file: $summFileName<br />";
-	              $xmlResults = simplexml_load_file($summFileName);
-	              $testResults[$expectedTestConfigs[$i]]["duration"]=$xmlResults->duration;
-	              $testResults[$expectedTestConfigs[$i]]["failCount"]=$xmlResults->failCount;
-	              $testResults[$expectedTestConfigs[$i]]["passCount"]=$xmlResults->passCount;
-	              $testResults[$expectedTestConfigs[$i]]["skipCount"]=$xmlResults->skipCount;
-	            }
                 $summFileJava11=strpos($summFileName, "java11");
                 $jobnameJava11=strpos($testResultsDirName."/".$jobname, "java11");
-                if (($summFileJava11 > 0) && ($summFileJava11 == $jobnameJava11 )) {
+                if ($summFileJava11 == $jobnameJava11 ) {
                   //echo "DEBUG: found matching summary file: $summFileName<br />";
                   $xmlResults = simplexml_load_file($summFileName);
                   $testResults[$expectedTestConfigs[$i]]["duration"]=$xmlResults->duration;
diff --git a/production/testScripts/invokeTestsJSON.xml b/production/testScripts/invokeTestsJSON.xml
index 762f83cfb..70422d268 100644
--- a/production/testScripts/invokeTestsJSON.xml
+++ b/production/testScripts/invokeTestsJSON.xml
@@ -78,13 +78,7 @@
         name="job"
         value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11" />
     </antcall>
-
-    <antcall target="triggerHudsonTests">
-      <param
-        name="job"
-        value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java10" />
-    </antcall>
-
+    
   </target>
   
   <target