Bug 567003 - Drop java 14 test run and add java 15 test run in automated tests

Change-Id: I483699d2bbc9b62a37de37d1df9a7cbf816f5330
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

9 files changed, 6 insertions, 38 deletions

diff --git a/JenkinsJobs/Builds/I-build.groovy b/JenkinsJobs/Builds/I-build.groovy
index ebb9ac0e5..db12be85a 100644
--- a/JenkinsJobs/Builds/I-build.groovy
+++ b/JenkinsJobs/Builds/I-build.groovy
@@ -451,7 +451,7 @@ spec:
 	  stage('Trigger tests'){
           steps {
               build job: 'ep418I-unit-cen64-gtk3-java11', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
-              build job: 'ep418I-unit-cen64-gtk3-java14', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
+              build job: 'ep418I-unit-cen64-gtk3-java15', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
               build job: 'ep418I-unit-mac64-java11', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
               build job: 'ep418I-unit-win32-java11', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
               build job: 'ep418I-perf-lin64-baseline', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
diff --git a/JenkinsJobs/Builds/Y-build.groovy b/JenkinsJobs/Builds/Y-build.groovy
index 874ab1976..68e695721 100644
--- a/JenkinsJobs/Builds/Y-build.groovy
+++ b/JenkinsJobs/Builds/Y-build.groovy
@@ -466,7 +466,6 @@ spec:
           steps {
               container('jnlp') {
                 build job: 'ep417Y-unit-cen64-gtk3-java11', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
-                build job: 'ep417Y-unit-cen64-gtk3-java14', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
                 build job: 'ep417Y-unit-cen64-gtk3-java15', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
                 build job: 'ep417Y-unit-mac64-java11', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
                 build job: 'ep417Y-unit-win32-java11', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
diff --git a/JenkinsJobs/SmokeTests/StartSmokeTests.groovy b/JenkinsJobs/SmokeTests/StartSmokeTests.groovy
index 1037ec218..9f8acce60 100644
--- a/JenkinsJobs/SmokeTests/StartSmokeTests.groovy
+++ b/JenkinsJobs/SmokeTests/StartSmokeTests.groovy
@@ -14,11 +14,6 @@ pipeline {
                         build job: 'ep-pipeline-ubuntu18-java11', parameters: [string(name: 'buildId', value: "${params.buildId}")]
                   }
               }
-              stage('Ubuntu 18.04 Java14'){
-                  steps {
-                        build job: 'ep-pipeline-ubuntu18-java14', parameters: [string(name: 'buildId', value: "${params.buildId}")]
-                  }
-              }
               stage('Ubuntu 18.04 Java15'){
                   steps {
                         build job: 'ep-pipeline-ubuntu18-java15', parameters: [string(name: 'buildId', value: "${params.buildId}")]
@@ -29,11 +24,6 @@ pipeline {
                         build job: 'ep-pipeline-ubuntu20-java11', parameters: [string(name: 'buildId', value: "${params.buildId}")]
                   }
               }
-              stage('Ubuntu 20.04 Java14'){
-                  steps {
-                        build job: 'ep-pipeline-ubuntu20-java14', parameters: [string(name: 'buildId', value: "${params.buildId}")]
-                  }
-              }
               stage('Ubuntu 20.04 Java15'){
                   steps {
                         build job: 'ep-pipeline-ubuntu20-java15', parameters: [string(name: 'buildId', value: "${params.buildId}")]
@@ -44,11 +34,6 @@ pipeline {
                         build job: 'ep-pipeline-cen7x-java11', parameters: [string(name: 'buildId', value: "${params.buildId}")]
                   }
               }
-              stage('Centos 7.x Java14'){
-                  steps {
-                        build job: 'ep-pipeline-cen7x-java14', parameters: [string(name: 'buildId', value: "${params.buildId}")]
-                  }
-              }
               stage('Centos 7.x Java15'){
                   steps {
                         build job: 'ep-pipeline-cen7x-java15', parameters: [string(name: 'buildId', value: "${params.buildId}")]
@@ -59,11 +44,6 @@ pipeline {
                         build job: 'ep-pipeline-cen8x-java11', parameters: [string(name: 'buildId', value: "${params.buildId}")]
                   }
               }
-              stage('Centos 8.x Java14'){
-                  steps {
-                        build job: 'ep-pipeline-cen8x-java14', parameters: [string(name: 'buildId', value: "${params.buildId}")]
-                  }
-              }
               stage('Centos 8.x Java15'){
                   steps {
                         build job: 'ep-pipeline-cen8x-java15', parameters: [string(name: 'buildId', value: "${params.buildId}")]
@@ -74,21 +54,11 @@ pipeline {
                         build job: 'ep-smoke-test-ppcle-java11', parameters: [string(name: 'buildId', value: "${params.buildId}")]
                   }
               }
-              stage('Centos 8.x ppc64le Java14'){
-                  steps {
-                        build job: 'ep-smoke-test-ppcle-java14', parameters: [string(name: 'buildId', value: "${params.buildId}")]
-                  }
-              }
               stage('Raspberry Pi OS arm64 Java11'){
                   steps {
                         build job: 'ep-smoke-test-arm64-java11', parameters: [string(name: 'buildId', value: "${params.buildId}")]
                   }
               }
-              stage('Raspberry Pi OS arm64 Java14'){
-                  steps {
-                        build job: 'ep-smoke-test-arm64-java14', parameters: [string(name: 'buildId', value: "${params.buildId}")]
-                  }
-              }
           }
 		}
 	}
diff --git a/cje-production/Y-build/publish.xml b/cje-production/Y-build/publish.xml
index 3a4591aab..62955ad8f 100644
--- a/cje-production/Y-build/publish.xml
+++ b/cje-production/Y-build/publish.xml
@@ -248,7 +248,7 @@
     <!-- else normal unit tests configs -->
     <property
       name="testsConfigExpected"
-      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java11_macosx.cocoa.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java11_win32.win32.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java14_linux.gtk.x86_64_14,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java15_linux.gtk.x86_64_15" />
+      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java11_macosx.cocoa.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java11_win32.win32.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java15_linux.gtk.x86_64_15" />
 
     <echo message=" = = properties in publish.xml == " />
     <echo message="     job: ${job}" />
diff --git a/cje-production/Y-build/publish2.xml b/cje-production/Y-build/publish2.xml
index cd1856d21..28211739c 100644
--- a/cje-production/Y-build/publish2.xml
+++ b/cje-production/Y-build/publish2.xml
@@ -271,7 +271,7 @@
     <!-- else normal unit tests configs -->
     <property
       name="testsConfigExpected"
-      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java11_macosx.cocoa.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java11_win32.win32.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java14_linux.gtk.x86_64_14,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java15_linux.gtk.x86_64_15" />
+      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java11_macosx.cocoa.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java11_win32.win32.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java15_linux.gtk.x86_64_15" />
 
     <echo message=" = = properties in publish.xml == " />
     <echo message="     job: ${job}" />
diff --git a/cje-production/Y-build/testConfigs.php b/cje-production/Y-build/testConfigs.php
index d36af14ed..f43d50b1c 100644
--- a/cje-production/Y-build/testConfigs.php
+++ b/cje-production/Y-build/testConfigs.php
@@ -13,5 +13,4 @@ $expectedTestConfigs = array();
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-mac64-java11_macosx.cocoa.x86_64_11";
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-win32-java11_win32.win32.x86_64_11";
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java11_linux.gtk.x86_64_11";
-$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java14_linux.gtk.x86_64_14";
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java15_linux.gtk.x86_64_15";
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
index bfa46279f..62955ad8f 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-java11_macosx.cocoa.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java11_win32.win32.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java14_linux.gtk.x86_64_14" />
+      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java11_macosx.cocoa.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java11_win32.win32.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java15_linux.gtk.x86_64_15" />
 
     <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 0c58ca18e..28211739c 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-java11_macosx.cocoa.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java11_win32.win32.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java14_linux.gtk.x86_64_14" />
+      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java11_macosx.cocoa.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java11_win32.win32.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java15_linux.gtk.x86_64_15" />
 
     <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 89aad81a3..f43d50b1c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
@@ -13,4 +13,4 @@ $expectedTestConfigs = array();
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-mac64-java11_macosx.cocoa.x86_64_11";
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-win32-java11_win32.win32.x86_64_11";
 $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java11_linux.gtk.x86_64_11";
-$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java14_linux.gtk.x86_64_14";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java15_linux.gtk.x86_64_15";