Bug 567406 - [16] Start creating Y builds from BETA_JAVA16

Change-Id: I04e741c6394ef7fb6f62a58318f23b68e5fb4fac
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

7 files changed, 14 insertions, 12 deletions

diff --git a/JenkinsJobs/Builds/Y-build.groovy b/JenkinsJobs/Builds/Y-build.groovy
index 68e695721..a6162c37c 100644
--- a/JenkinsJobs/Builds/Y-build.groovy
+++ b/JenkinsJobs/Builds/Y-build.groovy
@@ -467,6 +467,7 @@ spec:
               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-java15', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
+                build job: 'ep417Y-unit-cen64-gtk3-java16', 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
                 build job: 'Start-smoke-tests', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
index c3ec0b820..4b43bbd83 100644
--- a/cje-production/Y-build/buildproperties.txt
+++ b/cje-production/Y-build/buildproperties.txt
@@ -17,8 +17,8 @@
 
 # CJE build variables
 BRANCH="master"
-PATCH_OR_BRANCH_LABEL="java15"
-BUILD_TYPE_NAME="Beta Java 15"
+PATCH_OR_BRANCH_LABEL="java16"
+BUILD_TYPE_NAME="Beta Java 16"
 BUILD_TYPE="Y"
 TESTED_BUILD_TYPE="Y"
 RELEASE_VER="4.18"
@@ -38,8 +38,8 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
 LOCAL_REPO="localMavenRepo"
 
 # Base builder parameters
-BASEBUILDER_TAG="4.16"
-API_PREV_REF_LABEL="4.16"
+BASEBUILDER_TAG="4.17"
+API_PREV_REF_LABEL="4.17"
 #API_FREEZE_REF_LABEL="4.17RC1"
 API_FREEZE_REF_LABEL=""
 # Change to appropriate versions and uncomment when entering API freeze
diff --git a/cje-production/Y-build/publish.xml b/cje-production/Y-build/publish.xml
index 62955ad8f..82d0557e5 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-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,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java16_linux.gtk.x86_64_16" />
 
     <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 28211739c..a78c2fe3e 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-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,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java16_linux.gtk.x86_64_16"  />
 
     <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 f43d50b1c..3de84ce30 100644
--- a/cje-production/Y-build/testConfigs.php
+++ b/cje-production/Y-build/testConfigs.php
@@ -14,3 +14,4 @@ $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-mac64-
 $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-java15_linux.gtk.x86_64_15";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java16_linux.gtk.x86_64_16";
diff --git a/cje-production/streams/repositories_java15.txt b/cje-production/streams/repositories_java16.txt
index 577b45e68..5abe3feea 100644
--- a/cje-production/streams/repositories_java15.txt
+++ b/cje-production/streams/repositories_java16.txt
@@ -3,12 +3,12 @@ rt.equinox.bundles: master
 rt.equinox.framework: master
 rt.equinox.p2: master
 eclipse.jdt.core.binaries: master
-eclipse.jdt.core: BETA_JAVA15
-eclipse.jdt.debug: BETA_JAVA15
-eclipse.jdt: BETA_JAVA15
-eclipse.jdt.ui: BETA_JAVA15
-eclipse.pde.build: BETA_JAVA15
-eclipse.pde.ui: BETA_JAVA15
+eclipse.jdt.core: BETA_JAVA16
+eclipse.jdt.debug: master
+eclipse.jdt: master
+eclipse.jdt.ui: master
+eclipse.pde.build: master
+eclipse.pde.ui: master
 eclipse.platform.debug: master
 eclipse.platform.resources: master
 eclipse.platform: master
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java15.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java16.php
index cdab6c1fd..cdab6c1fd 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java15.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java16.php