Bug 564573 - Investigate need for P-build for Java 15

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

7 files changed, 189 insertions, 468 deletions

diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt
new file mode 100644
index 000000000..b9e5bc50a
--- /dev/null
+++ b/cje-production/P-build/buildproperties.txt
@@ -0,0 +1,62 @@
+#*******************************************************************************
+# Copyright (c) 2020 IBM Corporation and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     Sravan Lakkimsetti - initial API and implementation
+#*******************************************************************************
+
+# This file contains environmental properties as key value pairs. Lines starting
+# with # are considered comments and no spaces allowed in keys
+
+# CJE build variables
+BRANCH="master"
+PATCH_OR_BRANCH_LABEL="java15patch"
+PATCH_BUILD="true"
+BUILD_TYPE_NAME="Beta Java 15"
+BUILD_TYPE="P"
+TESTED_BUILD_TYPE="P"
+RELEASE_VER="4.17"
+STREAM="4.17.0"
+STREAMMajor="4"
+STREAMMinor="17"
+STREAMService="0"
+GIT_ROOT="ssh://genie.releng@git.eclipse.org:29418"
+AGG_REPO="/platform/eclipse.platform.releng.aggregator.git"
+AGG_DIR="gitCache/eclipse.platform.releng.aggregator"
+DROP_DIR="siteDir/eclipse/downloads/drops4"
+UPDATES_DIR="siteDir/eclipse/updates"
+EQUINOX_DROP_DIR="siteDir/equinox/drops"
+TMP_DIR="tmp"
+DOWNLOAD_HOST="download.eclipse.org"
+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"
+#API_FREEZE_REF_LABEL="4.17RC1"
+API_FREEZE_REF_LABEL=""
+# Change to appropriate versions and uncomment when entering API freeze
+#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.16RC1-202005280200/eclipse-SDK-4.16RC1-win32-x86_64.zip -DfreezeName=Eclipse-SDK-4.16RC1 -DfreezeFilename=eclipse-SDK-4.16RC1-win32-x86_64.zip"
+# Otherwise set to a blank space
+FREEZE_PARAMS=" "
+
+PREVIOUS_RELEASE_VER="4.16"
+PREVIOUS_RELEASE_REPO_ID="4.16"
+PREVIOUS_RELEASE_ID="R-4.16-202006040540"
+
+BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
+WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.18.0/R-3.18.0-20200605032700/repositoryunittests/"
+BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.17-I-builds/"
+
+#Maven parameters
+MAVEN_OPTS="-Xmx6G"
+JAVA_DOC_TOOL="-Declipse.javadoc=/opt/tools/java/openjdk/jdk-11/latest/bin/javadoc"
diff --git a/cje-production/P-build/mb220_buildSdkPatch.sh b/cje-production/P-build/mb220_buildSdkPatch.sh
new file mode 100755
index 000000000..0d78b10af
--- /dev/null
+++ b/cje-production/P-build/mb220_buildSdkPatch.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+#*******************************************************************************
+# Copyright (c) 2019 IBM Corporation and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     Kit Lo - initial API and implementation
+#*******************************************************************************
+set -e
+
+if [ $# -ne 1 ]; then
+  echo USAGE: $0 env_file
+  exit 1
+fi
+
+source $CJE_ROOT/scripts/common-functions.shsource
+source $1
+
+if [[ -z "${WORKSPACE}" ]]
+then
+	MVN_ARGS=""
+else
+	MVN_ARGS="-Pbree-libs -Peclipse-sign"
+fi
+
+cd $CJE_ROOT/gitCache/eclipse.platform.releng.aggregator
+mvn -f eclipse.platform.releng.tychoeclipsebuilder/${PATCH_OR_BRANCH_LABEL}/pom.xml \
+  clean verify -P${PATCH_OR_BRANCH_LABEL} \
+  -DskipTests=true ${MVN_ARGS} \
+  -Dtycho.debug.artifactcomparator \
+  -Dtycho.localArtifacts=ignore \
+  -Dcbi.jarsigner.continueOnFail=true \
+  -Djgit.dirtyWorkingTree=error \
+  -Dmaven.repo.local=$LOCAL_REPO \
+  -Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
+  -DaggregatorBuild=true \
+  -DbuildTimestamp=$TIMESTAMP \
+  -DbuildType=$BUILD_TYPE \
+  -DbuildId=$BUILD_ID \
+  -Declipse-p2-repo.url=NOT_FOR_PRODUCTION_USE \
+  ${JAVA_DOC_TOOL}
diff --git a/cje-production/P-build/mb300_gatherEclipseParts.sh b/cje-production/P-build/mb300_gatherEclipseParts.sh
new file mode 100755
index 000000000..6bf94fa75
--- /dev/null
+++ b/cje-production/P-build/mb300_gatherEclipseParts.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+#*******************************************************************************
+# Copyright (c) 2019, 2020 IBM Corporation and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     Kit Lo - initial API and implementation
+#*******************************************************************************
+set -e
+
+if [ $# -ne 1 ]; then
+  echo USAGE: $0 env_file
+  exit 1
+fi
+
+source $CJE_ROOT/scripts/common-functions.shsource
+source $1
+
+mkdir -p $CJE_ROOT/$UPDATES_DIR/$BUILD_ID
+
+JavaCMD=${JAVA_HOME}/bin/java
+
+# gather maven properties
+cp $CJE_ROOT/$AGG_DIR/eclipse-platform-parent/target/mavenproperties.properties  $CJE_ROOT/$DROP_DIR/$BUILD_ID/mavenproperties.properties
+
+# gather repo
+echo $PATCH_BUILD
+PATCH_BUILD_GENERIC=java15patch
+REPO_DIR=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.$PATCH_BUILD_GENERIC/target/repository
+  
+if [ -d $REPO_DIR ]; then
+  pushd $REPO_DIR
+  cp -r * $CJE_ROOT/$UPDATES_DIR/$BUILD_ID
+  popd
+fi
diff --git a/cje-production/P-build/mb620_promoteUpdateSite.sh b/cje-production/P-build/mb620_promoteUpdateSite.sh
new file mode 100755
index 000000000..024a50ba4
--- /dev/null
+++ b/cje-production/P-build/mb620_promoteUpdateSite.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+#*******************************************************************************
+# Copyright (c) 2019 IBM Corporation and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     Sravan Lakkimsetti - initial API and implementation
+#*******************************************************************************
+set -e
+
+if [ $# -ne 1 ]; then
+  echo USAGE: $0 env_file
+  exit 1
+fi
+
+source $CJE_ROOT/scripts/common-functions.shsource
+source $1
+
+epUpdateDir=/home/data/httpd/download.eclipse.org/eclipse/updates
+dropsPath=${epUpdateDir}/${STREAMMajor}.${STREAMMinor}-${BUILD_TYPE}-builds
+pushd $CJE_ROOT/$UPDATES_DIR
+scp -r ${BUILD_ID} genie.releng@projects-storage.eclipse.org:${dropsPath}/.
+popd
diff --git a/cje-production/Y-build/JenkinsPipeline b/cje-production/Y-build/JenkinsPipeline
deleted file mode 100644
index ceb98dada..000000000
--- a/cje-production/Y-build/JenkinsPipeline
+++ /dev/null
@@ -1,467 +0,0 @@
-pipeline {
-    options {
-        timeout(time: 300, unit: 'MINUTES')
-        timestamps()
-        buildDiscarder(logRotator(numToKeepStr:'5'))
-    }
-  agent {
-    kubernetes {
-      label 'aggrbuild-pod'
-      defaultContainer 'container'
-      yaml """
-apiVersion: v1
-kind: Pod
-spec:
-  containers:
-  - name: "jnlp"
-    image: "eclipsecbijenkins/jipp-migration-agent:4.3"
-    imagePullPolicy: "IfNotPresent"
-    resources:
-      limits:
-        memory: "8192Mi"
-        cpu: "2000m"
-      requests:
-        memory: "6144Mi"
-        cpu: "1000m"
-    securityContext:
-      privileged: false
-    tty: true
-    volumeMounts:
-    - mountPath: "/home/jenkins/agent"
-      name: "workspace-volume"
-      readOnly: false
-    - mountPath: "/home/jenkins/.m2/toolchains.xml"
-      name: "toolchains-xml"
-      readOnly: true
-      subPath: "toolchains.xml"
-    - mountPath: "/opt/tools"
-      name: "volume-0"
-      readOnly: false
-    - mountPath: "/home/jenkins"
-      name: "volume-2"
-      readOnly: false
-    - mountPath: "/home/jenkins/.m2/repository"
-      name: "volume-3"
-      readOnly: false
-    - mountPath: "/home/jenkins/.m2/settings-security.xml"
-      name: "settings-security-xml"
-      readOnly: true
-      subPath: "settings-security.xml"
-    - mountPath: "/home/jenkins/.m2/settings.xml"
-      name: "settings-xml"
-      readOnly: true
-      subPath: "settings.xml"
-    - mountPath: "/home/jenkins/.ssh"
-      name: "volume-1"
-      readOnly: false
-    workingDir: "/home/jenkins/agent"
-  nodeSelector: {}
-  restartPolicy: "Never"
-  volumes:
-  - name: "settings-security-xml"
-    secret:
-      items:
-      - key: "settings-security.xml"
-        path: "settings-security.xml"
-      secretName: "m2-secret-dir"
-  - name: "volume-0"
-    persistentVolumeClaim:
-      claimName: "tools-claim-jiro-releng"
-      readOnly: true
-  - configMap:
-      items:
-      - key: "toolchains.xml"
-        path: "toolchains.xml"
-      name: "m2-dir"
-    name: "toolchains-xml"
-  - emptyDir:
-      medium: ""
-    name: "volume-2"
-  - configMap:
-      name: "known-hosts"
-    name: "volume-1"
-  - name: "settings-xml"
-    secret:
-      items:
-      - key: "settings.xml"
-        path: "settings.xml"
-      secretName: "m2-secret-dir"
-  - emptyDir:
-      medium: ""
-    name: "workspace-volume"
-  - emptyDir:
-      medium: ""
-    name: "volume-3"
-"""
-    }
-  }
-  environment {
-      MAVEN_OPTS = "-Xmx6G"
-      CJE_ROOT = "${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production"
-      PATH = "$PATH:/opt/tools/apache-maven/latest/bin"
-      logDir = "$CJE_ROOT/buildlogs"
-    }
-  
-  stages {
-      stage('Clean Workspace'){
-          steps {
-              container('jnlp') {
-                sh '''
-                    cd $WORKSPACE
-                    rm -rf *
-                '''
-                }
-            }
-        }
-      stage('Setup intial configuration'){
-          steps {
-              container('jnlp') {
-                  sshagent(['git.eclipse.org-bot-ssh']) {
-                      dir ('eclipse.platform.releng.aggregator') {
-                        sh '''
-                            git clone -b master ssh://genie.releng@git.eclipse.org:29418/platform/eclipse.platform.releng.aggregator.git
-                        '''
-                      }
-                    }
-                    sh '''
-                        cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production
-                        chmod +x mbscripts/*
-                        mkdir -p $logDir
-                    '''
-                }
-            }
-        }
-      stage('Genrerate environment variables'){
-          steps {
-              container('jnlp') {
-                sh '''
-                    cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                    cp ../Y-build/buildproperties.txt ../buildproperties.txt
-                    ./mb010_createEnvfiles.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb010_createEnvfiles.sh.log
-                    if [[ ${PIPESTATUS[0]} -ne 0 ]]
-                    then
-                        echo "Failed in Genrerate environment variables stage"
-                        exit 1
-                    fi
-                '''
-                }
-            }
-        }
-      stage('Export environment variables'){
-          steps {
-              container('jnlp') {
-                script {
-                    env.BUILD_IID = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $BUILD_TYPE$TIMESTAMP)', returnStdout: true)
-                    env.BUILD_VERSION = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $RELEASE_VER)', returnStdout: true)
-                    env.STREAM = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $STREAM)', returnStdout: true)
-                    env.COMPARATOR_ERRORS = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $COMPARATOR_ERRORS)', returnStdout: true)
-                    env.EBUILDER_HASH = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $EBUILDER_HASH)', returnStdout: true)
-                    }
-                }
-            }
-        }
-      stage('Swt build input') {
-          steps {
-              build '1-SWT-Increment_if_needed'
-          }
-        }
-      stage('Create Base builder'){
-          steps {
-              container('jnlp') {
-                  withEnv(["JAVA_HOME=${ tool 'openjdk-jdk11-latest' }"]) {
-                      withAnt(installation: 'apache-ant-latest') {
-                        sh '''
-                            cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                            ./mb020_createBaseBuilder.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb020_createBaseBuilder.sh.log
-                            if [[ ${PIPESTATUS[0]} -ne 0 ]]
-                            then
-                                echo "Failed in Create Base builder stage"
-                                exit 1
-                            fi
-                        '''
-                      }
-                  }
-                }
-            }
-        }
-      stage('Download reference repo for repo reports'){
-          steps {
-              container('jnlp') {
-                  sshagent(['projects-storage.eclipse.org-bot-ssh']) {
-                    sh '''
-                        cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                        ./mb030_downloadBuildToCompare.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb030_downloadBuildToCompare.sh.log
-                        if [[ ${PIPESTATUS[0]} -ne 0 ]]
-                        then
-                            echo "Failed in Download reference repo for repo reports stage"
-                            exit 1
-                        fi
-                    '''
-                  }
-                }
-            }
-        }
-      stage('Clone Repositories'){
-          steps {
-              container('jnlp') {
-                  sshagent(['git.eclipse.org-bot-ssh']) {
-                    sh '''
-                        git config --global user.email "releng-bot@eclipse.org"
-                        git config --global user.name "Eclipse Releng Bot"
-                        cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                        ./mb100_cloneRepos.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb100_cloneRepos.sh.log
-                        if [[ ${PIPESTATUS[0]} -ne 0 ]]
-                        then
-                            echo "Failed in Clone Repositories stage"
-                            exit 1
-                        fi
-                    '''
-                  }
-                }
-            }
-        }
-      stage('Tag Build Inputs'){
-          steps {
-              container('jnlp') {
-                  sshagent(['git.eclipse.org-bot-ssh']) {
-                    sh '''
-                        git config --global user.email "releng-bot@eclipse.org"
-                        git config --global user.name "Eclipse Releng Bot"
-                        cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                        bash -x ./mb110_tagBuildInputs.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb110_tagBuildInputs.sh.log
-                        if [[ ${PIPESTATUS[0]} -ne 0 ]]
-                        then
-                            echo "Failed in Tag Build Inputs stage"
-                            exit 1
-                        fi
-                    '''
-                  }
-                }
-            }
-        }
-      stage('Copy test configs for Y-build'){
-          steps {
-              container('jnlp') {
-                    sh '''
-                        cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/Y-build
-                        cp testConfigs.php ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/gitCache/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/.
-                        cp testConfigs.php ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/.
-                    '''
-                }
-            }
-        }
-      stage('Create Source Bundles'){
-          steps {
-              container('jnlp') {
-                  withEnv(["JAVA_HOME=${ tool 'openjdk-jdk11-latest' }"]) {
-                    sh '''
-                        cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                        unset JAVA_TOOL_OPTIONS 
-                        unset _JAVA_OPTIONS
-                        ./mb200_createSourceBundles.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb200_createSourceBundles.sh.log
-                        if [[ ${PIPESTATUS[0]} -ne 0 ]]
-                        then
-                            echo "Failed in Create Source Bundles stage"
-                            exit 1
-                        fi
-                    '''
-                  }
-                }
-            }
-        }
-      stage('Update Pom files in the source'){
-          steps {
-              container('jnlp') {
-                  withEnv(["JAVA_HOME=${ tool 'openjdk-jdk11-latest' }"]) {
-                    sh '''
-                        cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                        unset JAVA_TOOL_OPTIONS 
-                        unset _JAVA_OPTIONS
-                        ./mb210_updatePom.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb210_updatePom.sh.log
-                        if [[ ${PIPESTATUS[0]} -ne 0 ]]
-                        then
-                            echo "Failed in Update Pom files in the source stage"
-                            exit 1
-                        fi
-                    '''
-                  }
-                }
-            }
-        }
-      stage('Aggregator maven build'){
-          steps {
-              container('jnlp') {
-                  withEnv(["JAVA_HOME=${ tool 'openjdk-jdk11-latest' }"]) {
-                    sh '''
-                        cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                        unset JAVA_TOOL_OPTIONS 
-                        unset _JAVA_OPTIONS
-                        ./mb220_buildSdkPatch.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb220_buildSdkPatch.sh.log
-                        if [[ ${PIPESTATUS[0]} -ne 0 ]]
-                        then
-                            echo "Failed in Aggregator maven build stage"
-                            exit 1
-                        fi
-                    '''
-                  }
-                }
-            }
-        }
-      stage('Gather Eclipse Parts'){
-          steps {
-              container('jnlp') {
-                  withEnv(["JAVA_HOME=${ tool 'openjdk-jdk11-latest' }"]) {
-                      withAnt(installation: 'apache-ant-latest') {
-                          sh '''
-                            cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                            bash -x ./mb300_gatherEclipseParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb300_gatherEclipseParts.sh.log
-                            if [[ ${PIPESTATUS[0]} -ne 0 ]]
-                            then
-                                echo "Failed in Gather Eclipse Parts stage"
-                                exit 1
-                            fi
-                          '''
-                      }
-                  }
-                }
-            }
-        }
-      stage('Gather Equinox Parts'){
-          steps {
-              container('jnlp') {
-                  withEnv(["JAVA_HOME=${ tool 'openjdk-jdk11-latest' }"]) {
-                      withAnt(installation: 'apache-ant-latest') {
-                          sh '''
-                            cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                            ./mb310_gatherEquinoxParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb310_gatherEquinoxParts.sh.log
-                            if [[ ${PIPESTATUS[0]} -ne 0 ]]
-                            then
-                                echo "Failed in Gather Equinox Parts stage"
-                                exit 1
-                            fi
-                          '''
-                      }
-                  }
-                }
-            }
-        }
-      stage('Generate Repo reports'){
-          steps {
-              container('jnlp') {
-                  withEnv(["JAVA_HOME=${ tool 'openjdk-jdk11-latest' }"]) {
-                      sh '''
-                        cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                        unset JAVA_TOOL_OPTIONS 
-                        unset _JAVA_OPTIONS
-                        ./mb500_createRepoReports.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb500_createRepoReports.sh.log
-                        if [[ ${PIPESTATUS[0]} -ne 0 ]]
-                        then
-                            echo "Failed in Generate Repo reports stage"
-                            exit 1
-                        fi
-                      '''
-                  }
-                }
-            }
-        }
-      stage('Generate API tools reports'){
-          steps {
-              container('jnlp') {
-                  withEnv(["JAVA_HOME=${ tool 'openjdk-jdk11-latest' }"]) {
-                      sh '''
-                        cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                        unset JAVA_TOOL_OPTIONS 
-                        unset _JAVA_OPTIONS
-                        ./mb510_createApiToolsReports.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb510_createApiToolsReports.sh.log
-                        if [[ ${PIPESTATUS[0]} -ne 0 ]]
-                        then
-                            echo "Failed in Generate API tools reports stage"
-                            exit 1
-                        fi
-                      '''
-                  }
-                }
-            }
-        }
-      stage('Archive artifacts'){
-          steps {
-              container('jnlp') {
-                sh '''
-                    cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production
-                    source $CJE_ROOT/buildproperties.shsource
-                    cp -r $logDir/* $CJE_ROOT/$DROP_DIR/$BUILD_ID/buildlogs
-                    rm -rf $logDir
-                    rm -rf $CJE_ROOT/$DROP_DIR/$BUILD_ID/apitoolingreference
-                    cp $CJE_ROOT/buildproperties.txt $CJE_ROOT/$DROP_DIR/$BUILD_ID
-                    cp $CJE_ROOT/buildproperties.php $CJE_ROOT/$DROP_DIR/$BUILD_ID
-                    cp $CJE_ROOT/buildproperties.properties $CJE_ROOT/$DROP_DIR/$BUILD_ID
-                    cp $CJE_ROOT/buildproperties.shsource $CJE_ROOT/$DROP_DIR/$BUILD_ID
-                    cp $CJE_ROOT/$DROP_DIR/$BUILD_ID/buildproperties.* $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID
-                '''
-              }
-              archiveArtifacts '**/siteDir/**'
-            }
-        }
-      stage('Promote Eclipse platform'){
-          steps {
-              container('jnlp') {
-                  sshagent(['projects-storage.eclipse.org-bot-ssh']) {
-                      sh '''
-                        cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                        ./mb600_promoteEclipse.sh $CJE_ROOT/buildproperties.shsource
-                      '''
-                  }
-                }
-                build job: 'eclipse.releng.updateIndex', wait: false
-            }
-        }
-      stage('Promote Equinox'){
-          steps {
-              container('jnlp') {
-                  sshagent(['projects-storage.eclipse.org-bot-ssh']) {
-                      sh '''
-                        cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                        ./mb610_promoteEquinox.sh $CJE_ROOT/buildproperties.shsource
-                      '''
-                  }
-                }
-            }
-        }
-      stage('Promote Update Site'){
-          steps {
-              container('jnlp') {
-                  sshagent(['projects-storage.eclipse.org-bot-ssh']) {
-                      sh '''
-                        cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
-                        ./mb620_promoteUpdateSite.sh $CJE_ROOT/buildproperties.shsource
-                      '''
-                  }
-                }
-            }
-        }
-      stage('Trigger tests'){
-          steps {
-              build job: 'ep416Y-unit-cen64-gtk3-java11', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
-              build job: 'ep416Y-unit-cen64-gtk3-java8', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
-              build job: 'ep416Y-unit-cen64-gtk3-java14', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
-              build job: 'ep416Y-unit-cen64-gtk3-java15', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
-              build job: 'ep416Y-unit-mac64-java8', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
-              build job: 'ep416Y-unit-win32-java8', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
-            }
-        }
-    }
-    post {
-        failure {
-            emailext body: "Please go to ${BUILD_URL}/console and check the build failure.<br><br>",
-            subject: "${env.BUILD_VERSION} Y-Build: ${env.BUILD_IID.trim()} - BUILD FAILED", 
-            to: "jarthana@in.ibm.com",
-            from:"genie.releng@eclipse.org"
-        }
-        success {
-            emailext body: "Eclipse downloads:<br>    https://download.eclipse.org/eclipse/downloads/drops4/${env.BUILD_IID.trim()}<br><br> Build logs and/or test results (eventually):<br>    https://download.eclipse.org/eclipse/downloads/drops4/${env.BUILD_IID.trim()}/testResults.php<br><br>Software site repository:<br>    https://download.eclipse.org/eclipse/updates/4.16-Y-builds<br><br>Specific (simple) site repository:<br>    https://download.eclipse.org/eclipse/updates/4.16-Y-builds/${env.BUILD_IID.trim()}<br><br>Equinox downloads:<br>     https://download.eclipse.org/equinox/drops/${env.BUILD_IID.trim()}<br><br>", 
-            subject: "${env.BUILD_VERSION} Y-Build: ${env.BUILD_IID.trim()}", 
-            to: "jarthana@in.ibm.com",
-            from:"genie.releng@eclipse.org"
-        }
-    }
-}
diff --git a/cje-production/mbscripts/mb300_gatherEclipseParts.sh b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
index 73c1bc77f..b1e57c92a 100755
--- a/cje-production/mbscripts/mb300_gatherEclipseParts.sh
+++ b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
@@ -38,7 +38,7 @@ echo $PATCH_BUILD
 if [ -z $PATCH_BUILD ]; then
   REPO_DIR=$PLATFORM_REPO_DIR
 else
-  PATCH_BUILD_GENERIC=java14patch
+  PATCH_BUILD_GENERIC=java15patch
   REPO_DIR=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.$PATCH_BUILD_GENERIC/target/repository
 fi
   
diff --git a/cje-production/streams/repositories_java15patch.txt b/cje-production/streams/repositories_java15patch.txt
new file mode 100644
index 000000000..3dabce8b1
--- /dev/null
+++ b/cje-production/streams/repositories_java15patch.txt
@@ -0,0 +1,6 @@
+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