Bug 548523 - Performance tests are pending

Update stuff for new performance test workflow without central
performance database. Test samples are serialized, transfered as build
artifacts and imported by another job in a local database for result
generation.

Change-Id: Iada39ca9520c1219aaa384c64fc42d991bc9d18e
Signed-off-by: Paul Pazderski <paul-eclipse@ppazderski.de>

4 files changed, 31 insertions, 12 deletions

diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index 5fcab67be..e54d3426b 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -677,6 +677,11 @@
       value="${results}/${testedPlatform}/directorLogs" />
     <mkdir dir="${directorLogs}" />
     <echo message="directorLogs: ${directorLogs}" />
+    
+    <property
+      name="eclipse.perf.samples.out"
+      value="${results}/${testedPlatform}-perf-samples.dat" />
+    <echo message="eclipse.perf.samples.out: ${eclipse.perf.samples.out}" />
 
     <!-- this directory, with some sort files are created during unit tests
       ... need to find where to disable/enable JaCoCo -->
@@ -1490,9 +1495,6 @@
       TODO: would have to compute these in runTest2.xml, to make part of production properties,
       and phpproperties.php
     -->
-    <property
-      name="eclipse.perf.dbloc"
-      value="${eclipse.perf.dbloc.value}" />
     <!-- 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? -->
@@ -1522,8 +1524,8 @@
     <!-- frameworkperfargs is used by library.xml ... probably an easier way? -->
     <condition
       property="frameworkperfargs"
-      value="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}"
-      else="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config}">
+      value="-DInternalWriteRawPerformanceData=${eclipse.perf.samples.out} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}"
+      else="-DInternalWriteRawPerformanceData=${eclipse.perf.samples.out} -Declipse.perf.config=${eclipse.perf.config}">
       <isset property="eclipse.perf.assertAgainst" />
     </condition>
 
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 34b213bd7..d8488e7d5 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -40,7 +40,9 @@ baselinePerfVersion=R-4.12-201906051800
 baselinePerfVersionLabel=4.12
 baselinePerfBuildId=I20190605-1800
 
-eclipse.perf.dbloc.value=//build.eclipse.org:1527
+# Derby database cannot used to store performance results anymore. (see Bug 548523)
+# Instead samples are serialized into a file and included in build artifacts.
+#eclipse.perf.dbloc.value=//build.eclipse.org:1527
 
 # We currently set here, but would be better to compute this value 
 # by peeking in the "to be tested" tar file. 
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index 76caae7db..00df07af5 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -50,9 +50,6 @@
       else="${buildURL}">
       <istrue value="${baselinePerf}" />
     </condition>
-    <property
-      name="eclipse.perf.dbloc"
-      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? -->
 
@@ -80,8 +77,8 @@
     <!-- frameworkperfargs is used by library.xml ... probably an easier way? -->
     <condition
       property="frameworkperfargs"
-      value="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}"
-      else="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config}">
+      value="-DInternalWriteRawPerformanceData=${eclipse.perf.samples.out} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}"
+      else="-DInternalWriteRawPerformanceData=${eclipse.perf.samples.out} -Declipse.perf.config=${eclipse.perf.config}">
       <isset property="eclipse.perf.assertAgainst" />
     </condition>
     <echo message="setRuntimeArchive os ${os} ws ${ws} arch ${arch}" />
@@ -579,6 +576,7 @@
     <printProperty property="javaMajorVersion" />
     <printProperty property="testedPlatform" />
     <printProperty property="testedPlatformConfig" />
+    <printProperty property="eclipse.perf.samples.out" />
     <printProperty property="eclipse.perf.dbloc" />
     <printProperty property="eclipse.perf.config" />
     <printProperty property="eclipse.perf.assertAgainst" />
@@ -927,6 +925,12 @@
       value="${results}/${testedPlatform}/directorLogs" />
     <mkdir dir="${directorLogs}" />
     <echo message="directorLogs: ${directorLogs}" />
+    
+    <property
+      name="eclipse.perf.samples.out"
+      value="${results}/${testedPlatform}-perf-samples.dat" />
+    <echo message="eclipse.perf.samples.out: ${eclipse.perf.samples.out}" />
+    
 
     <!-- this directory, with some sort files are created during unit tests
       ... need to find where to disable/enable JaCoCo -->
@@ -1114,6 +1118,9 @@
       phpvar="TEST_TARGET"
       value="test.target" />
     <printPHPProperty
+      phpvar="ECLIPSE_PERF_SAMPLES_OUT"
+      value="eclipse.perf.samples.out" />
+    <printPHPProperty
       phpvar="ECLIPSE_PERF_DBLOC"
       value="eclipse.perf.dbloc" />
 
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index d5637d052..44bc9950c 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -235,7 +235,7 @@ then
 
   echo " = = Now run performance.ui app = ="
   devworkspace="${fromDir}/workspace-updatePerfResults"
-  eclipse_perf_dbloc_value=${eclipse_perf_dbloc_value:-//build.eclipse.org:1527}
+  eclipse_perf_dbloc_value=${eclipse_perf_dbloc_value:-/shared/eclipse}
   vmargs="-Xmx1G -Declipse.perf.dbloc=${eclipse_perf_dbloc_value}"
   postingDirectory=$fromDir
   perfOutput=$postingDirectory/performance
@@ -345,6 +345,14 @@ then
   echo "   XVFB_RUN_ARGS $XVFB_RUN_ARGS" #>> ${PERF_OUTFILE}
   echo "   current_prefix ${current_prefix}" #>> ${PERF_OUTFILE}
   echo #>> ${PERF_OUTFILE}
+  
+  ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.test.performance.ui.ImportDataMain -jvm 8.0 -vm ${devJRE} -vmargs ${vmargs} $perfOutput/*-perf-samples.dat
+  RC=$?
+  if [[ $RC != 0 ]]
+  then
+    echo "ERROR: eclipse returned non-zero return code from invoking performance data import, exiting with RC: $RC."
+    exit $RC
+  fi
 
   ${XVFB_RUN} ${XVFB_RUN_ARGS} ${ECLIPSE_EXE} --launcher.suppressErrors  -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.test.performance.ui.resultGenerator -baseline ${baselineForCurrent} -current ${buildId} -jvm 8.0 -config linux.gtk.x86_64 -config.properties "linux.gtk.x86_64,SUSE Linux Enterprise Server 12 (x86_64)" -output $perfOutput -dataDir ${dataDir} ${current_prefix} -print -vm ${devJRE}  -vmargs ${vmargs}  #>> ${PERF_OUTFILE}
   RC=$?