Bug 536298 - Update previous release to 4.8

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

16 files changed, 40 insertions, 177 deletions

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 83ea0d09c..c7868db85 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
@@ -7,12 +7,12 @@ org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=\${basedir}\\\\ec
 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=\${basedir}/eclipse-platform-4.7.3a-linux-gtk.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.7.3a-win32.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.7.3a-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.7.3a-macosx-cocoa-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=\${basedir}/eclipse-platform-4.8-linux-gtk.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.8-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.8-win32.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.8-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.8-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.7/R-4.7.3a-201803300640
+org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.8/R-4.8-201806110500
 
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 f1947a6f0..f0a8298dc 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.7.3a
+previousReleaseVersion=4.8
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 9753c8a63..cec4bb730 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,8 +7,8 @@
 
 
 mkdir -p workarea/${buildId}/eclipse-testing
-#cp /home/files/buildzips/oxygen/R/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
-cp /home/files/buildzips/oxygen/R/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+#cp /home/files/buildzips/oxygen/R/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
 
 cp ../../eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz workarea/${buildId}/eclipse-testing/
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
index b435da233..441db6f09 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
@@ -87,16 +87,16 @@
       (and make "version" variable)
     -->
     <!-- example of typical value, when "directory" and "label" are different
-      <property name="eclipseBaseDir" value="S-4.7M3-201710291100"/>
-      <property name="eclispeBaseLabel" value="4.7M3"/>
+      <property name="eclipseBaseDir" value="S-4.8M3-201710291100"/>
+      <property name="eclispeBaseLabel" value="4.8M3"/>
     -->
     <!-- for I or M build (which is the unusual case) the build directory and label are the same -->
     <property
       name="eclipseBaseDir"
-      value="S-4.8RC2-201805240900" />
+      value="R-4.8-201806110500" />
     <property
       name="eclispeBaseLabel"
-      value="4.8RC2" />
+      value="4.8" />
 
     <property
       name="platformURL"
@@ -138,7 +138,7 @@
     <echo message="DEBUG: Before setting default, eclisperun-repo was found to be ${eclipserun-repo-is-set}" />
     <!-- the following setting is just to make sure we have a reasonable "fallback" value, such as when
       using this script on Hudson to do "clean up" of repositories. Should change it to "well known" version,
-      such as updates/4.7/ once it is ready.
+      such as updates/4.8/ once it is ready.
     -->
     <property
       name="eclipserun-repo"
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 0bd567afa..7cf30b6f5 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1158,9 +1158,9 @@ fn-summarize-apitooling ()
     -DbuildId="$BUILD_ID" \
     -DbuildLabel="$BUILD_ID" \
     -DbuildWorkingArea="${BUILD_HOME}/4${BUILD_TYPE}/gitCache/eclipse.platform.releng.aggregator" \
-    -DpreviousBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.8RC2-201805240900/eclipse-SDK-4.8RC2-win32.zip \
-    -DpreviousBaselineName=Eclipse-SDK-4.8RC2 \
-    -DpreviousBaselineFilename=eclipse-SDK-4.8RC2-win32.zip \
+    -DpreviousBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-win32.zip \
+    -DpreviousBaselineName=Eclipse-SDK-4.8 \
+    -DpreviousBaselineFilename=eclipse-SDK-4.8-win32.zip \
     -Djava.io.tmpdir=$TMP_DIR \
     ${FREEZE_PARAMS} \
     apiToolsReports
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index ac631073e..244d85991 100644
--- a/production/build_eclipse_org.shsource
+++ b/production/build_eclipse_org.shsource
@@ -93,7 +93,7 @@ export PATH=$JAVA_HOME/bin:$MAVEN_PATH:$ANT_HOME/bin:$PATH
 
 # Only used to start antrunner for tests.
 # TODO: avoid this hard coding
-BASEBUILDER_TAG=4.7.3a
+BASEBUILDER_TAG=4.8
 
 B_GIT_EMAIL=genie.releng@eclipse.org
 B_GIT_NAME="Releng HIPP"
diff --git a/production/createReports.sh b/production/createReports.sh
index a3e718826..605cf268d 100755
--- a/production/createReports.sh
+++ b/production/createReports.sh
@@ -33,7 +33,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.7/R-4.7.3a-201803300640"
+buildIdToCompare="4.8/R-4.8-201806110500"
 
 build_type=${buildIdToTest:0:1}
 echo -e "\tbuild_type: ${build_type}"
@@ -64,8 +64,8 @@ function latestSimpleRepo
 if [[ ${build_type} == "I" ]]
 then
   update_dir_segment="4.9-I-builds"
-  buildIdToCompare="4.8milestones/S-4.8RC2-201805240900"
-  echo -e "\tlatest_R_build: S-4.8RC2-201805240900"
+  buildIdToCompare="4.8/R-4.8-201806110500"
+  echo -e "\tlatest_R_build: R-4.8-201806110500"
 elif [[ ${build_type} == "Y" ]]
 then
   update_dir_segment="4.9-Y-builds"
@@ -104,7 +104,7 @@ then
   mkdir -p ${output_dir}
 
   # This analyzersBuildId can (currently) be found by "drilling down" at 
-  # http://download.eclipse.org/cbi/updates/analyzers/4.7/
+  # http://download.eclipse.org/cbi/updates/analyzers/4.8/
   # analyzersBuildId=I20161201-1633
   # We use analyzer from hipp this way we have one less version to track
   tar_name=org.eclipse.cbi.p2repo.analyzers.product-linux.gtk.x86_64.tar.gz
diff --git a/production/downloadsites/eclipse/downloads/dlYconfig4.php b/production/downloadsites/eclipse/downloads/dlYconfig4.php
index 75b95d429..a87f4a129 100644
--- a/production/downloadsites/eclipse/downloads/dlYconfig4.php
+++ b/production/downloadsites/eclipse/downloads/dlYconfig4.php
@@ -1,11 +1,9 @@
 <?php
 $dropPrefix = array();
 $dropPrefix[]="Y";
-$dropPrefix[]="U";
 $dropPrefix[]="P";
 $dropType = array();
-$dropType[]="4.7 Java 9 Beta Builds";
-$dropType[]="4.7 JUnit 5 Beta Builds";
+$dropType[]="4.9 Java 11 Beta Builds";
 $dropType[]="Patch Builds";
 // the "prefix" array and dropType array must be of same size, defined in right order
 for ($i = 0; $i < count($dropType); $i++) {
diff --git a/production/downloadsites/eclipse/updates/index.html b/production/downloadsites/eclipse/updates/index.html
index aa8a19163..13e081ba5 100644
--- a/production/downloadsites/eclipse/updates/index.html
+++ b/production/downloadsites/eclipse/updates/index.html
@@ -2,9 +2,9 @@
 <html>
     <head>
         <title>Eclipse</title>
-        <meta http-equiv="REFRESH" content="0;url=http://download.eclipse.org/eclipse/updates/4.7/" />
+        <meta http-equiv="REFRESH" content="0;url=http://download.eclipse.org/eclipse/updates/4.8/" />
     </head>
     <body>
-        This page will redirect to <a href="http://download.eclipse.org/eclipse/updates/4.7/">current software repository</a>.
+        This page will redirect to <a href="http://download.eclipse.org/eclipse/updates/4.8/">current software repository</a>.
     </body>
 </html>
diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
index 67326f318..e10893a37 100755
--- a/production/miscToolsAndNotes/checkComposites/checkComposites.sh
+++ b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
@@ -19,16 +19,13 @@
 # and then executed in "bash script" build step.
 
 baseEclipseAccessDir=/home/data/httpd/download.eclipse.org
-baseEclipseDirSegment=eclipse/downloads/drops4/R-4.7.3a-201803300640
-baseEclipse=eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz
+baseEclipseDirSegment=eclipse/downloads/drops4/R-4.8-201806110500
+baseEclipse=eclipse-platform-4.8-linux-gtk-x86_64.tar.gz
 repoFileAccess=file:///home/data/httpd/download.eclipse.org/
 repoHttpAccess=http://download.eclipse.org
 repoAccess=${repoFileAccess}
 # TODO: reduce this list soon
 repoList="\
-/eclipse/updates/4.7/ \
-/eclipse/updates/4.8-I-builds/ \
-/eclipse/updates/4.8milestones/ \
 /eclipse/updates/4.8/ \
 /eclipse/updates/4.9-I-builds/ \
 /eclipse/updates/4.9-Y-builds/ \
diff --git a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
index 5e3eb619b..f1c566107 100644
--- a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
+++ b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
@@ -94,10 +94,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.8RC2-201805240900" />
+      value="R-4.8-201806110500" />
     <property
       name="eclispeBaseLabel"
-      value="4.8RC2" />
+      value="4.8" />
 
     <property
       name="platformURL"
@@ -139,7 +139,7 @@
     <echo message="DEBUG: Before setting default, eclisperun-repo was found to be ${eclipserun-repo-is-set}" />
     <!-- the following setting is just to make sure we have a reasonable "fallback" value, such as when
       using this script on Hudson to do "clean up" of repositories. Should change it to "well known" version,
-      such as updates/4.7/ once it is ready.
+      such as updates/4.8/ once it is ready.
     -->
     <property
       name="eclipserun-repo"
diff --git a/production/sdk/bootstrap/mb4I_hudson_photon.sh b/production/sdk/bootstrap/mb4I_hudson_photon.sh
deleted file mode 100755
index de57f2b55..000000000
--- a/production/sdk/bootstrap/mb4I_hudson_photon.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/env bash
-
-# This job is just like its cronjob counter part, except it 
-# turns off verbose debugging (else Hudson logs would be 300 MB)
-# and does not pipe output to separate files, but lets it all go 
-# to Hudson't "console". 
-# Normally resides in $BUILD_HOME
-
-function usage()
-{
-  printf "\n\tSimple script start a build of a certain stream." >&2
-  printf "\n\tUsage: %s [[-h] | [-t]] " $(basename $0) >&2
-  printf "\n\t\t%s\n" "where h==help, t==test build " >&2
-}
-
-# Start with minimal path for consistency across machines
-# plus, cron jobs do not inherit an environment
-# care is needed not have anything in ${HOME}/bin that would effect the build
-# unintentionally, but is required to make use of "source localBuildProperties.shsource" on
-# local machines.
-# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it
-# to false) for a test I-build on a remote machine.
-export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin
-# unset common variables (some defined for genie.releng) which we don't want (or, set ourselves)
-unset JAVA_HOME
-unset JAVA_ROOT
-unset JAVA_JRE
-unset CLASSPATH
-unset JAVA_BINDIR
-unset JRE_HOME
-
-# 0002 is often the default for shell users, but it is not when ran from
-# a cron job, so we set it explicitly, so releng group has write access to anything
-# we create.
-NEWUMASK="0002"
-oldumask=$(umask)
-umask $NEWUMASK
-
-echo "ulimit (file handles): $( ulimit -n ) "
-ulimit -n 4096
-echo "ulimit (file handles): $( ulimit -n ) "
-
-echo "locale charmap: $(locale charmap)"
-echo "LC_ALL: $LC_ALL"
-echo "LANG: $LANG"
-echo "LANGUAGE: $LANGUAGE"
-export LC_ALL=en_US.UTF-8
-export LANG=en_US.UTF-8
-export LANGUAGE=en_US.UTF-8
-echo "LC_ALL: $LC_ALL"
-echo "LANG: $LANG"
-echo "LANGUAGE: $LANGUAGE"
-echo "locale charmap: $(locale charmap)"
-
-# all optional
-# normally, when ran from crobjob, none should be specified
-while getopts 'hti' OPTION
-do
-  case $OPTION in
-    h)    usage
-      exit
-      ;;
-    t)    export testbuildonly=true
-      ;;
-    i)    export invisibleBuild=true
-      ;;
-  esac
-done
-
-# this localBuildProperties.shsource file is to ease local builds to override some variables.
-# It should not be used for production builds.
-source localBuildProperties.shsource 2>/dev/null
-
-# BUILD_HOME defines the "top" of the build area (for all types of builds)
-export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
-
-SCRIPT_NAME=$0
-
-echo "Starting $SCRIPT_NAME at $( date +%Y%m%d-%H%M ) "
-
-echo "umask explicitly set to $NEWUMASK, old value was $oldumask"
-
-export BRANCH=R4_8_maintenance
-export BUILD_TYPE=I
-export STREAM=4.8.0
-
-eclipseStreamMajor=${STREAM:0:1}
-
-# unique short name for stream and build type
-BUILDSTREAMTYPEDIR=${eclipseStreamMajor}$BUILD_TYPE
-
-export BUILD_ROOT=${BUILD_HOME}/${BUILDSTREAMTYPEDIR}
-
-# These values for proxies come from the configuration files of the Releng HIPP instance. 
-# They are normally defined in "ANT_OPTS" and similar environment variables, but 
-# the JavaDoc program requires them is this special -Jflag form. 
-export JAVA_DOC_PROXIES=${JAVA_DOC_PROXIES:-"-J-Dhttps.proxyHost=proxy.eclipse.org -J-Dhttps.proxyPort=9898 -J-Dhttps.nonProxyHosts=\"172.30.206.*\""}
-
-# These definitions are primarily for Curl. (Wget and other programs use different env variables or parameters
-export NO_PROXY=${NO_PROXY:-eclipse.org,build.eclipse.org,download.eclipse.org,archive.eclipse.org,dev.eclipes.org,git.eclipse.org}
-export ALL_PROXY=${ALL_PROXY:-proxy.eclipse.org:9898}
-
-# default (later) is set to 'true'. 
-# set to false here for less output.
-# setting to false until  bug 495750 is fixed, else too much output.
-export MVN_DEBUG=false
-
-
-export PRODUCTION_SCRIPTS_DIR=production
-if [[ -z "${WORKSPACE}" ]]
-then
-   export RUNNING_ON_HUDSON=false
-else
-   export RUNNING_ON_HUDSON=true
-fi
-echo -e "\n\t[INFO]RUNNING_ON_HUDSON: $RUNNING_ON_HUDSON"
-
-# To allow this cron job to work from hudson, or traditional crontab
-if [[ -z "${WORKSPACE}" ]]
-then
-  export UTILITIES_HOME=/shared/eclipse
-  source $BUILD_HOME/bootstrap.shsource
-  makeProductionDirectoryOnBuildMachine
-  # build_eclipse_org.shsource should come from branch 
-  # though ideally  the rest of "production" directory would be identical between branches.
-${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/master-build.sh "${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/build_eclipse_org.shsource" 
-else
-  export UTILITIES_HOME=${WORKSPACE}/utilities/production
-  source $UTILITIES_HOME/sdk/bootstrap/bootstrap.shsource
-  $UTILITIES_HOME/master-build.sh $UTILITIES_HOME/build_eclipse_org.shsource
-fi
-
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
index 42b4f1da2..61106e69e 100755
--- a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
+++ b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
@@ -50,7 +50,7 @@ then
   exit 1
 else
   echo "stableEclipseInstallation directory found, as expected, at ${stableEclipseInstallLocation}"
-  # should only be one tar file there, with a name similar to eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz 
+  # should only be one tar file there, with a name similar to eclipse-platform-4.8-linux-gtk-x86_64.tar.gz 
   # so for simplicity, we'll assume all is well and untar what ever we find. 
   tar -xf ${stableEclipseInstallLocation}/*tar.gz -C ${stableEclipseInstallLocation}
 fi
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 31d79bfa1..94776ca24 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.9.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://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7.3a-201803300640
+previousReleaseLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.8-201806110500
 # 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.7.3a
+previousReleaseVersion=4.8
 # 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.7
+previousReleaseVersionRepo=4.8
 
 # 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=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7-201706120950
-baselinePerfVersion=R-4.7-201706120950
+baselinePerfLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.8-201806110500
+baselinePerfVersion=R-4.8-201806110500
 # TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.7
-baselinePerfBuildId=I20170612-0950
+baselinePerfVersionLabel=4.8
+baselinePerfBuildId=I20180611-0500
 
 eclipse.perf.dbloc.value=//172.25.25.57:1527
 
diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh
index 0e340ec64..51d6a4e0b 100755
--- a/production/testScripts/test_runTests2.xml.sh
+++ b/production/testScripts/test_runTests2.xml.sh
@@ -86,7 +86,7 @@ wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose   http://${GIT_HOST}/c/platfor
 
 ANTFILE=getEBuilder.xml
 buildId=I20150320-0800
-eclipseStream=4.7.0
+eclipseStream=4.8.0
 EBUILDER_HASH=master
 #EBUILDER_HASH=4295494c43e464a0c4ee39b7e0c847fbc3263f2a
 
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index 54bd43b8c..d182ea5b4 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -314,7 +314,7 @@ then
   RAW_DATE_START=$( date -u +%s )
 
   # TODO: avoid this hard coding of baseline value
-  baselineCode="R-4.7.3a-201803300640"
+  baselineCode="R-4.8-201806110500"
   # to get time stamp, first remove initial IMN:
   baselineForBuildSuffix=${buildId/[IMN]/}
   #Then remove final '-' in build id