Bug 571694 - Update product version number to 4.20 across build script

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

9 files changed, 41 insertions, 38 deletions

diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
index 0046f0228..109f74da7 100644
--- a/cje-production/buildproperties.txt
+++ b/cje-production/buildproperties.txt
@@ -21,10 +21,10 @@ PATCH_OR_BRANCH_LABEL="master"
 BUILD_TYPE_NAME="Integration"
 BUILD_TYPE="I"
 TESTED_BUILD_TYPE="I"
-RELEASE_VER="4.19"
-STREAM="4.19.0"
+RELEASE_VER="4.20"
+STREAM="4.20.0"
 STREAMMajor="4"
-STREAMMinor="19"
+STREAMMinor="20"
 STREAMService="0"
 GIT_ROOT="ssh://genie.releng@git.eclipse.org:29418"
 AGG_REPO="/platform/eclipse.platform.releng.aggregator.git"
@@ -38,18 +38,21 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
 LOCAL_REPO="localMavenRepo"
 
 # Base builder parameters
-BASEBUILDER_TAG="4.18"
-API_PREV_REF_LABEL="4.18"
-API_FREEZE_REF_LABEL="4.19RC1"
+BASEBUILDER_TAG="4.19"
+API_PREV_REF_LABEL="4.19"
+API_FREEZE_REF_LABEL="4.20RC1"
 #API_FREEZE_REF_LABEL=""
 # Change to appropriate versions and uncomment when entering API freeze
 FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202102241800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
 # Otherwise set to a blank space
 #FREEZE_PARAMS=" "
 
-PREVIOUS_RELEASE_VER="4.18"
-PREVIOUS_RELEASE_REPO_ID="4.18"
-PREVIOUS_RELEASE_ID="R-4.18-202012021800"
+PREVIOUS_RELEASE_VER="4.19RC2"
+PREVIOUS_RELEASE_REPO_ID="4.19-I-builds"
+#build id for getting repo
+BASEBUILD_ID="I20210303-1800"
+#release id for downloading eclipse
+PREVIOUS_RELEASE_ID="S-4.19RC2-202103031800"
 
 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/"
diff --git a/cje-production/mbscripts/mb030_downloadBuildToCompare.sh b/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
index 0b711f6b2..6be2e6010 100755
--- a/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
+++ b/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
@@ -27,5 +27,5 @@ pushd $CJE_ROOT/$TMP_DIR
 mkdir -p $CJE_ROOT/$TMP_DIR/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER
 epDownloadDir=/home/data/httpd/download.eclipse.org/eclipse
 p2RepoPath=${epDownloadDir}/updates
-scp -r genie.releng@projects-storage.eclipse.org:$p2RepoPath/$PREVIOUS_RELEASE_REPO_ID/$PREVIOUS_RELEASE_ID $CJE_ROOT/$TMP_DIR/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/.
+scp -r genie.releng@projects-storage.eclipse.org:$p2RepoPath/$PREVIOUS_RELEASE_REPO_ID/$BASEBUILD_ID $CJE_ROOT/$TMP_DIR/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/.
 popd
diff --git a/cje-production/mbscripts/mb500_createRepoReports.sh b/cje-production/mbscripts/mb500_createRepoReports.sh
index 29780205c..f035c4198 100755
--- a/cje-production/mbscripts/mb500_createRepoReports.sh
+++ b/cje-production/mbscripts/mb500_createRepoReports.sh
@@ -36,6 +36,6 @@ mkdir -p $report_app_dir
 tar -xf $CJE_ROOT/$TMP_DIR/$tar_name -C $report_app_dir
 
 $report_app_dir/p2analyze/p2analyze -data $CJE_ROOT/$TMP_DIR/workspace-report -vm $JAVA_HOME/bin -vmargs -Xmx1g \
-  -DreferenceRepo=$CJE_ROOT/$TMP_DIR/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/$PREVIOUS_RELEASE_ID \
+  -DreferenceRepo=$CJE_ROOT/$TMP_DIR/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/$BASEBUILD_ID \
   -DreportRepoDir=$buildToTest \
   -DreportOutputDir=$output_dir
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 72bd37117..a242c75f6 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -49,7 +49,7 @@
       such as Version: Mars (4.5), for main features.
       See bug 328139.
     -->
-    <releaseName>2021-03</releaseName>
+    <releaseName>2021-06</releaseName>
     <!--
       The releaseNumbers below, for SDK and Platform, might be
       thought of as the "marketing number" or "branding number",
@@ -64,8 +64,8 @@
       but we'd still want the "marketing number" to be increased to reflect
       "a new yearly release".
     -->
-    <releaseNumberSDK>4.19</releaseNumberSDK>
-    <releaseNumberPlatform>4.19</releaseNumberPlatform>
+    <releaseNumberSDK>4.20</releaseNumberSDK>
+    <releaseNumberPlatform>4.20</releaseNumberPlatform>
 
 
 	<!-- using released version (normal case)
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
index e0c29a5e3..b69698dee 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
@@ -1,8 +1,8 @@
 instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.19,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.19,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2021-03,name:2021-03);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2021-03,name:2021-03);\
+addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.20,name:The Eclipse Project Updates);\
+addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.20,name:The Eclipse Project Updates);\
+addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2021-06,name:2021-06);\
+addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2021-06,name:2021-06);\
   mkdir(path:${installFolder}/dropins);
 requires.1.namespace=org.eclipse.equinox.p2.iu
 requires.1.name=toolingorg.eclipse.configuration.macosx
@@ -49,7 +49,7 @@ properties.0.name = org.eclipse.equinox.p2.type.product
 properties.0.value = true
 
 properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = 4.19 Release of the Platform SDK.
+properties.1.value = 4.20 Release of the Platform SDK.
 
 properties.2.name = org.eclipse.equinox.p2.provider
 properties.2.value = Eclipse.org
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
index db0bebaeb..f31560c60 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
@@ -1,8 +1,8 @@
 instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.19,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.19,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2021-03,name:2021-03);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2021-03,name:2021-03);\
+addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.20,name:The Eclipse Project Updates);\
+addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.20,name:The Eclipse Project Updates);\
+addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2021-06,name:2021-06);\
+addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2021-06,name:2021-06);\
   mkdir(path:${installFolder}/dropins);
 requires.1.namespace=org.eclipse.equinox.p2.iu
 requires.1.name=toolingorg.eclipse.platform.configuration.macosx
@@ -51,7 +51,7 @@ properties.0.name = org.eclipse.equinox.p2.type.product
 properties.0.value = true
 
 properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = 4.19 Release of the Eclipse Platform.
+properties.1.value = 4.20 Release of the Eclipse Platform.
 
 properties.2.name = org.eclipse.equinox.p2.provider
 properties.2.value = Eclipse.org
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
index 7ccc04f5e..3ae188ec3 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
@@ -1,8 +1,8 @@
 instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.19,name:The Eclipse Project Updates);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.19,name:The Eclipse Project Updates);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2021-03,name:2021-03);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2021-03,name:2021-03);\
+addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.20,name:The Eclipse Project Updates);\
+addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.20,name:The Eclipse Project Updates);\
+addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2021-06,name:2021-06);\
+addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2021-06,name:2021-06);\
   mkdir(path:${installFolder}/dropins);
 requires.1.namespace=org.eclipse.equinox.p2.iu
 requires.1.name=toolingorg.eclipse.sdk.configuration.macosx
@@ -49,7 +49,7 @@ properties.0.name = org.eclipse.equinox.p2.type.product
 properties.0.value = true
 
 properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = 4.19 Release of the Eclipse SDK.
+properties.1.value = 4.20 Release of the Eclipse SDK.
 
 properties.2.name = org.eclipse.equinox.p2.provider
 properties.2.value = Eclipse.org
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 940774761..342cc8537 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -5,22 +5,22 @@
 
 # purely title or identifier for display, to help confirm right file
 # is being retrieved and used.
-streamSpecificPropertiesTitle="Properties for 4.19.0 builds and tests"
+streamSpecificPropertiesTitle="Properties for 4.20.0 builds and tests"
 
 # These "previousRelease" variables are primarily used to have a
 # stable version of Eclipse, that is used, for example, for it's p2
 # director, etc., so that "running the tests" is not actually using
 # the "just built" versions.
-previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.18-202012021800/
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.19RC2-202103031800/
 # version here is "build label" ... in general form, the "middle" of archive name,
 # such as  "eclipse-platform-${previousReleaseVersion}-linux-gtk-x86_64.tar.gz
 # Also used used in p2 testing?
-previousReleaseVersion=4.18
+previousReleaseVersion=4.18RC2
 # This is last segment of last release repo, such as in
 #  http://${ARCHIVE_HOST}/eclipse/updates/${previousReleaseVersion}
 # NOTE: I am assuming the "composite" repo is suitable for p2. In theory,
 # they might want the simple repo, such as at 4.4/R-4.4.1-201409250400
-previousReleaseVersionRepo=4.18
+previousReleaseVersionRepo=4.19-I-builds
 
 # Note: API tests needs the _base_ of previous release, and also the previous service release
 # Bug 378587 - update releng tests (data) to go work against previous release
@@ -34,12 +34,12 @@ apiTestsPreviousRefererenceWin32Filename=obsoleteAndNotUsed
 # baselinePerf=true
 # are specified. The baselinePerf will often be the same as "previous release", but
 # not necessarily, so is not hard coded in assumptions.
-baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.18-202012021800
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.19RC2-202103031800
 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=R-4.18-202012021800
+baselinePerfVersion=S-4.19RC2-202103031800
 # TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.18
-baselinePerfBuildId=I20201202-1800
+baselinePerfVersionLabel=4.19RC2
+baselinePerfBuildId=I20210303-1800
 
 # We currently set here, but would be better to compute this value 
 # by peeking in the "to be tested" tar file. 
diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh
index fa11e7315..d56d0fd6e 100755
--- a/production/testScripts/test_runTests2.xml.sh
+++ b/production/testScripts/test_runTests2.xml.sh
@@ -81,7 +81,7 @@ wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose   https://${GIT_HOST}/c/platfo
 
 ANTFILE=getEBuilder.xml
 buildId=I20150320-0800
-eclipseStream=4.19.0
+eclipseStream=4.20.0
 EBUILDER_HASH=master
 #EBUILDER_HASH=4295494c43e464a0c4ee39b7e0c847fbc3263f2a