Bug 553751 - Move to release version of 4.14 in build scripts

Change-Id: I93afd2fcfa5b4423b92b2e38f0e310bda67073a1
Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>

6 files changed, 19 insertions, 19 deletions

diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 6095b1856..b4746362c 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1181,9 +1181,9 @@ fn-summarize-apitooling ()
   # Make sure FREEZE_PARAMS is defined, but empty space, if not using freeze reports.
   FREEZE_PARAMS=" "
   # When no "freeze" in effect for a release comment these out. Uncomment after M6, changing to appropriate versions.
-  #FREEZE_PARAMS="-DfreezeBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.14RC1-201911271800/eclipse-SDK-4.14RC1-win32-x86_64.zip \
-  #  -DfreezeName=Eclipse-SDK-4.14RC1 \
-  #  -DfreezeFilename=eclipse-SDK-4.14RC1-win32-x86_64.zip "
+  #FREEZE_PARAMS="-DfreezeBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.14-201912100610/eclipse-SDK-4.14-win32-x86_64.zip \
+  #  -DfreezeName=Eclipse-SDK-4.14 \
+  #  -DfreezeFilename=eclipse-SDK-4.14-win32-x86_64.zip "
   # this API_PREV_REF_LABEL variable should be changed any time the version used
   # by previousBaseURL changes. Its purpose is just to localize changes to this one
   # place, and not have to make further, hard-coded changes to php files.
@@ -1191,7 +1191,7 @@ fn-summarize-apitooling ()
   # NOTE: the *reference* for API changes should be the "previous release", even if it is a "service release".
   API_PREV_REF_LABEL=4.14
   fn-write-property API_PREV_REF_LABEL
-  #API_FREEZE_REF_LABEL=4.14RC2
+  #API_FREEZE_REF_LABEL=4.14
   API_FREEZE_REF_LABEL=" "
   fn-write-property API_FREEZE_REF_LABEL
   java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \
@@ -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.14RC2-201912041800/eclipse-SDK-4.14RC2-win32-x86_64.zip \
-    -DpreviousBaselineName=Eclipse-SDK-4.14RC2 \
-    -DpreviousBaselineFilename=eclipse-SDK-4.14RC2-win32-x86_64.zip \
+    -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 \
     -Djava.io.tmpdir=$TMP_DIR \
     ${FREEZE_PARAMS} \
     apiToolsReports
diff --git a/production/createReports.sh b/production/createReports.sh
index 26acd34ae..4c57f6f22 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.14milestones/S-4.14RC2-201912041800"
+buildIdToCompare="4.14milestones/R-4.14-201912100610"
 
 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.15-I-builds"
-  buildIdToCompare="4.14milestones/S-4.14RC2-201912041800"
-  echo -e "\tlatest_R_build: S-4.14RC2-201912041800"
+  buildIdToCompare="4.14milestones/R-4.14-201912100610"
+  echo -e "\tlatest_R_build: R-4.14-201912100610"
 elif [[ ${build_type} == "Y" ]]
 then
   update_dir_segment="4.15-Y-builds"
diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
index 9157e263c..e491c291c 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.14RC2-201912041800
-baseEclipse=eclipse-platform-4.14RC2-linux-gtk-x86_64.tar.gz
+baseEclipseDirSegment=eclipse/downloads/drops4/R-4.14-201912100610
+baseEclipse=eclipse-platform-4.14-linux-gtk-x86_64.tar.gz
 repoFileAccess=file:///home/data/httpd/download.eclipse.org/
 repoHttpAccess=http://download.eclipse.org
 repoAccess=${repoFileAccess}
diff --git a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
index d6cda0630..83059d2e9 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="S-4.14RC1-201911271800" />
+      value="R-4.14-201912100610" />
     <property
       name="eclispeBaseLabel"
-      value="4.14RC1" />
+      value="4.14" />
 
     <property
       name="platformURL"
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index a26ff8f03..fd58ebe15 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,11 +11,11 @@ streamSpecificPropertiesTitle="Properties for 4.15.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=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.14RC2-201912041800
+previousReleaseLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.14-201912100610
 # 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.14RC2
+previousReleaseVersion=4.14
 # 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,
@@ -34,9 +34,9 @@ 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=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.14RC2-201912041800
+baselinePerfLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.14-201912100610
 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=S-4.14RC2-201912041800
+baselinePerfVersion=R-4.14-201912100610
 # TODO: could/should eventually "compute" label, from full version?
 baselinePerfVersionLabel=4.14
 baselinePerfBuildId=I20191204-1800
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index 06e6d4b7e..af0e9d720 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.14RC2-201912041800"
+  baselineCode="R-4.14-201912100610"
   # to get time stamp, first remove initial IMN:
   baselineForBuildSuffix=${buildId/[IMN]/}
   #Then remove final '-' in build id