Bug 561209 - Cleanup of download page for 4.15 GA release

- Moving to release version in the scripts as after cleanup temporary locations will not be available

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

13 files changed, 37 insertions, 32 deletions

diff --git a/cje-production/X-build/buildproperties.txt b/cje-production/X-build/buildproperties.txt
index 8047f91b8..cac54224e 100644
--- a/cje-production/X-build/buildproperties.txt
+++ b/cje-production/X-build/buildproperties.txt
@@ -42,8 +42,8 @@ BASEBUILDER_TAG="4.15"
 API_PREV_REF_LABEL="4.15"
 #API_FREEZE_REF_LABEL="4.15RC1"
 API_FREEZE_REF_LABEL=""
-PREVIOUS_RELEASE_VER="4.14"
-PREVIOUS_RELEASE_ID="R-4.14-201912100610"
+PREVIOUS_RELEASE_VER="4.15"
+PREVIOUS_RELEASE_ID="R-4.15-202003050155"
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repositoryunittests/"
 WEBTOOLS_VER="1.2.0.v201405010053"
diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
index 684a65d1f..1e16da533 100644
--- a/cje-production/buildproperties.txt
+++ b/cje-production/buildproperties.txt
@@ -40,9 +40,10 @@ LOCAL_REPO="localMavenRepo"
 # Base builder parameters
 BASEBUILDER_TAG="4.15"
 API_PREV_REF_LABEL="4.15"
-API_FREEZE_REF_LABEL="4.15RC1"
-PREVIOUS_RELEASE_VER="4.14"
-PREVIOUS_RELEASE_ID="R-4.14-201912100610"
+#API_FREEZE_REF_LABEL="4.15RC1"
+API_FREEZE_REF_LABEL=""
+PREVIOUS_RELEASE_VER="4.15"
+PREVIOUS_RELEASE_ID="R-4.15-202003050155"
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repositoryunittests/"
 WEBTOOLS_VER="1.2.0.v201405010053"
diff --git a/cje-production/scripts/checkComposites/checkComposites.sh b/cje-production/scripts/checkComposites/checkComposites.sh
index 7da5167fd..b8884ce8e 100755
--- a/cje-production/scripts/checkComposites/checkComposites.sh
+++ b/cje-production/scripts/checkComposites/checkComposites.sh
@@ -26,12 +26,16 @@ repoHttpAccess=https://download.eclipse.org
 repoAccess=${repoHttpAccess}
 # TODO: reduce this list soon
 repoList="\
-/eclipse/updates/4.14/ \
 /eclipse/updates/4.15/ \
+/eclipse/updates/4.16/ \
 /eclipse/updates/4.15-I-builds/ \
 /eclipse/updates/4.15milestones/ \
 /eclipse/updates/4.15-Y-builds/ \
 /eclipse/updates/4.15-P-builds/ \
+/eclipse/updates/4.16-I-builds/ \
+/eclipse/updates/4.16milestones/ \
+/eclipse/updates/4.16-Y-builds/ \
+/eclipse/updates/4.16-P-builds/ \
 "
 
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
index c2376bf43..69289849a 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
@@ -5,10 +5,10 @@ org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
 
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.15RC2-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.15RC2-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.15RC2-macosx-cocoa-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.15-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.15-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.15-macosx-cocoa-x86_64.tar.gz
 
 org.eclipse.equinox.p2.tests.current.build.repo=http\://download.eclipse.org/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}
-org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.15milestones/S-4.15RC2-202003050155/
+org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.15/R-4.15-202003050155/
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
index a2a3eee06..a07a088cb 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
@@ -5,4 +5,4 @@ buildId=${buildId}
 # such as "4.5" instead of "4.5.0".
 eclipseStream=${releaseNumberSDK}
 # similar for previous release version
-previousReleaseVersion=4.14
+previousReleaseVersion=4.15
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
index 6d72e95b7..1a64995c6 100755
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
@@ -7,9 +7,9 @@
 
 
 mkdir -p workarea/${buildId}/eclipse-testing
-cp /home/files/buildzips/oxygen/R/S-4.15RC2-202003050155/eclipse-platform-4.15RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/R-4.15-202003050155/eclipse-platform-4.15-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
 
-cp /home/files/buildzips/oxygen/R/S-4.15RC2-202003050155/eclipse-SDK-4.15RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/R-4.15-202003050155/eclipse-SDK-4.15-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
 
 cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
index 04dc488ee..15a25509f 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
@@ -96,10 +96,10 @@
     <!-- for I or M build (which is the unusual case) the build directory and label are the same -->
     <property
       name="eclipseBaseDir"
-      value="R-4.14-201912100610" />
+      value="R-4.15-202003050155" />
     <property
       name="eclispeBaseLabel"
-      value="4.14" />
+      value="4.15" />
 
     <property
       name="platformURL"
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 8d72f5e88..097f9cc76 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/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 \
+    -DpreviousBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.15-202003050155/eclipse-SDK-4.15-win32-x86_64.zip \
+    -DpreviousBaselineName=Eclipse-SDK-4.15 \
+    -DpreviousBaselineFilename=eclipse-SDK-4.15-win32-x86_64.zip \
     -Djava.io.tmpdir=$TMP_DIR \
     ${FREEZE_PARAMS} \
     apiToolsReports
diff --git a/production/createReports.sh b/production/createReports.sh
index c5f346e10..f29f3dfa8 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.15milestones/S-4.15RC2-202003050155"
+buildIdToCompare="4.15/R-4.15-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.15milestones/S-4.15RC2-202003050155"
-  echo -e "\tlatest_R_build: S-4.15RC2-202003050155"
+  buildIdToCompare="4.15/R-4.15-202003050155"
+  echo -e "\tlatest_R_build: R-4.15-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 92e5ef474..c65abd0a4 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/S-4.15RC2-202003050155
-baseEclipse=eclipse-platform-4.15RC2-linux-gtk-x86_64.tar.gz
+baseEclipseDirSegment=eclipse/downloads/drops4/R-4.15-202003050155
+baseEclipse=eclipse-platform-4.15-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/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
index e1e04114f..6f0313804 100644
--- a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
+++ b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
@@ -97,10 +97,10 @@
     <!-- for I or M build (which is the unusual case) the build directory and label are the same -->
     <property
       name="eclipseBaseDir"
-      value="R-4.14-201912100610" />
+      value="R-4.15-202003050155" />
     <property
       name="eclispeBaseLabel"
-      value="4.14" />
+      value="4.15" />
 
     <property
       name="platformURL"
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 7e74dafa1..6be76d29d 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/S-4.15RC2-202003050155
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.15-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.15RC2
+previousReleaseVersion=4.15
 # 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.15milestones
+previousReleaseVersionRepo=4.15
 
 # 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,11 +34,11 @@ 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/S-4.15RC2-202003050155
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.15-202003050155
 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=S-4.15RC2-202003050155
+baselinePerfVersion=R-4.15-202003050155
 # TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.15RC2
+baselinePerfVersionLabel=4.15
 baselinePerfBuildId=I20200305-0155
 
 # Derby database cannot used to store performance results anymore. (see Bug 548523)
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index 859ddb31a..11fd4696d 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="S-4.15RC2-202003050155"
+  baselineCode="R-4.15-202003050155"
   # to get time stamp, first remove initial IMN:
   baselineForBuildSuffix=${buildId/[IMN]/}
   #Then remove final '-' in build id