Bug 560875 - Move previous version to 4.15RC2 across build scripts

Change-Id: I6d829645dd505af25e47343e5bb6396a4de08aed
Signed-off-by: Mat Booth <mat.booth@redhat.com>

5 files changed, 16 insertions, 16 deletions

diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index e4235a109..ff1606591 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1203,9 +1203,9 @@ fn-summarize-apitooling ()
     -DbuildId="$BUILD_ID" \
     -DbuildLabel="$BUILD_ID" \
     -DbuildWorkingArea="${BUILD_HOME}/4${BUILD_TYPE}/gitCache/eclipse.platform.releng.aggregator" \
-    -DpreviousBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.14-201912100610/eclipse-SDK-4.14-win32-x86_64.zip \
-    -DpreviousBaselineName=Eclipse-SDK-4.14 \
-    -DpreviousBaselineFilename=eclipse-SDK-4.14-win32-x86_64.zip \
+    -DpreviousBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.15RC2-202003050155/eclipse-SDK-4.15RC2-win32-x86_64.zip \
+    -DpreviousBaselineName=Eclipse-SDK-4.15RC2 \
+    -DpreviousBaselineFilename=eclipse-SDK-4.15RC2-win32-x86_64.zip \
     -Djava.io.tmpdir=$TMP_DIR \
     ${FREEZE_PARAMS} \
     apiToolsReports
diff --git a/production/createReports.sh b/production/createReports.sh
index f880bbe05..c5f346e10 100755
--- a/production/createReports.sh
+++ b/production/createReports.sh
@@ -37,7 +37,7 @@ echo -e "\tbuildIdToTest: ${BUILD_ID}"
 # TODO: we could have a "previous_release" sort of variable that 
 # would be defined in parent pom or build_eclipse_org.shsource so that
 # we do not need to change this source. 
-buildIdToCompare="4.14/R-4.14-201912100610"
+buildIdToCompare="4.15milestones/S-4.15RC2-202003050155"
 
 build_type=${buildIdToTest:0:1}
 echo -e "\tbuild_type: ${build_type}"
@@ -68,8 +68,8 @@ function latestSimpleRepo
 if [[ ${build_type} == "I" ]]
 then
   update_dir_segment="4.16-I-builds"
-  buildIdToCompare="4.14/R-4.14-201912100610"
-  echo -e "\tlatest_R_build: R-4.14-201912100610"
+  buildIdToCompare="4.15milestones/S-4.15RC2-202003050155"
+  echo -e "\tlatest_R_build: S-4.15RC2-202003050155"
 elif [[ ${build_type} == "Y" ]]
 then
   update_dir_segment="4.16-Y-builds"
diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
index 0b77d6c80..92e5ef474 100755
--- a/production/miscToolsAndNotes/checkComposites/checkComposites.sh
+++ b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
@@ -22,8 +22,8 @@
 # and then executed in "bash script" build step.
 
 baseEclipseAccessDir=/home/data/httpd/download.eclipse.org
-baseEclipseDirSegment=eclipse/downloads/drops4/R-4.14-201912100610
-baseEclipse=eclipse-platform-4.14-linux-gtk-x86_64.tar.gz
+baseEclipseDirSegment=eclipse/downloads/drops4/S-4.15RC2-202003050155
+baseEclipse=eclipse-platform-4.15RC2-linux-gtk-x86_64.tar.gz
 repoFileAccess=file:///home/data/httpd/download.eclipse.org/
 repoHttpAccess=https://download.eclipse.org
 repoAccess=${repoFileAccess}
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 237747675..363580135 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.16.0 builds and tests"
 # 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.14-201912100610
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.15RC2-202003050155
 # 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.14
+previousReleaseVersion=4.15RC2
 # 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.14
+previousReleaseVersionRepo=4.15milestones
 
 # 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.14-201912100610
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.15RC2-202003050155
 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=R-4.14-201912100610
+baselinePerfVersion=S-4.15RC2-202003050155
 # TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.14
-baselinePerfBuildId=I20191210-0610
+baselinePerfVersionLabel=4.15
+baselinePerfBuildId=I20200305-0155
 
 # Derby database cannot used to store performance results anymore. (see Bug 548523)
 # Instead samples are serialized into a file and included in build artifacts.
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index af0e9d720..859ddb31a 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -314,7 +314,7 @@ then
 
   # TODO: avoid this hard coding of baseline value
   # NOTE: value must start with a letter match baselinePerfVersion in testScripts/configuration/streamSpecific.properties
-  baselineCode="R-4.14-201912100610"
+  baselineCode="S-4.15RC2-202003050155"
   # to get time stamp, first remove initial IMN:
   baselineForBuildSuffix=${buildId/[IMN]/}
   #Then remove final '-' in build id