Bug 498915 - remove "altbaseline" related variables and logic

Change-Id: Ibf616214cc3b720b7fed569966f0b82b44126478

4 files changed, 16 insertions, 35 deletions

diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index 07f0d510d..4857a3ace 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -922,12 +922,7 @@
   <target
     name="setRuntimeArchive"
     unless="runtimeArchive">
-    <!-- we'll check "alt" baselinePerf first. This is what's used for "several releases ago", or similar. -->
-    <condition
-      property="buildIdToUse"
-      value="${baselinePerfAltVersionLabel}">
-      <istrue value="${baselinePerfAlt}" />
-    </condition>
+
     <condition
       property="buildIdToUse"
       value="${baselinePerfVersionLabel}"
@@ -1457,11 +1452,7 @@
     <!-- buildIdToUse equals either baselinePerfVersion or else equals buildId. In either case we want to collect the data -->
     <!-- TODO: Do we need "buildID" coded somewhere, to know WHICH build to match with?
       Or, else will take large number of "baselines" averaged? -->
-    <condition
-      property="eclipse.perf.config"
-      value="build=${baselinePerfAltVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}">
-      <istrue value="${baselinePerfAlt}" />
-    </condition>
+
     <condition
       property="eclipse.perf.config"
       value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}"
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index bef08adad..eb2bff8d5 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -31,18 +31,13 @@ apiTestsPreviousRefererenceBaseDLBaseURL=obsoleteAndNotUsed
 apiTestsPreviousRefererenceWin32Filename=obsoleteAndNotUsed
 
 # the following are not used in unit tests, only performance tests, when the variables
-# baselinePerf=true,
-# or baselinePerfAlt=true
+# 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.6-201606061100
 baselinePerfVersion=R-4.6-201606061100
 # TODO: could/should eventually "compute" label, from full version?
 baselinePerfVersionLabel=4.6
-#
-# "alt" won't be used, for a while, if ever, but this is included as preparation.
-baselinePerfAltLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops/R-3.8.2-201301310800
-baselinePerfAltVersion=3.8.2
 
 eclipse.perf.dbloc.value=//172.25.25.57:1527
 
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index 140bf405b..8243586a8 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -30,18 +30,6 @@
       name="buildURL"
       value="http://${DOWNLOAD_HOST}/eclipse/downloads/${dropsDirSegment}/${buildId}" />
 
-    <!-- we'll check "alt" baselinePerf first. This is what's used for "several
-      releases ago", or similar. -->
-    <condition
-      property="buildIdToUse"
-      value="${baselinePerfAltVersionLabel}">
-      <istrue value="${baselinePerfAlt}" />
-    </condition>
-    <condition
-      property="archiveLocation"
-      value="${baselinePerfAltLocation}">
-      <istrue value="${baselinePerfAlt}" />
-    </condition>
     <!-- if 'baselinePerf' is specified, need to it for "buildId", plus adjust
       URL to it, not what we just built. Only "tests" always get buildURL -->
     <condition
@@ -61,11 +49,7 @@
       value="${eclipse.perf.dbloc.value}" />
     <!-- TODO: Do we need "buildID" coded somewhere, to know WHICH build to
       match with? Or, else will take large number of "baselines" averaged? -->
-    <condition
-      property="eclipse.perf.config"
-      value="build=${baselinePerfAltVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}">
-      <istrue value="${baselinePerfAlt}" />
-    </condition>
+
     <condition
       property="eclipse.perf.config"
       value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}"
@@ -553,7 +537,6 @@
     <printProperty property="previousReleaseVersion" />
     <printProperty property="previousReleaseVersionRepo" />
     <printProperty property="baselinePerf" />
-    <printProperty property="baselinePerfAlt" />
     <printProperty property="osgi.os" />
     <printProperty property="osgi.ws" />
     <printProperty property="osgi.arch" />
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index ee8dbde04..3b1088e0b 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -243,6 +243,18 @@ then
   # common location doesn't seem to work, with our multi-run method. So, will
   # make unique, for now. (Might work ok, if we just had "short set" and "long set" locations?
   ROOT_PERF_DATA=/shared/eclipse/perfdataDir
+  
+  # experiment with deleting previous .dat files, and regenerate all that are needed. 
+  # (I believe they are a "performance improvement" for the test analysis itself, but 
+  # I suspect they make a lot of assumptions that are no longer true. 
+  rm -fr ${ROOT_PERF_DATA}
+  RC=$?
+  if [[ $RC != 0 ]]
+  then
+    echo "Could not remove ${ROOT_PERF_DATA}. Return code was $RC. Exiting."
+    exit $RC
+  fi  
+  # re-create
   mkdir -p  ${ROOT_PERF_DATA}
   RC=$?
   if [[ $RC != 0 ]]